Timesheet
bzr revid: pinky-970b9a72923a1021b5753707b850d22d6d3f4b03
This commit is contained in:
pinky
parent
64216c3578
commit
f5284f3bd8
|
|
@ -33,232 +33,279 @@ from osv import osv
|
|||
|
||||
from mx import DateTime
|
||||
|
||||
class one2many_mod2(fields.one2many):
|
||||
def get(self, cr, obj, ids, name, user=None, offset=0, context={}, values={}):
|
||||
res = {}
|
||||
for id in ids:
|
||||
res[id] = []
|
||||
|
||||
res5 = obj.read(cr, user, ids, ['date_current'], context)
|
||||
res6 = {}
|
||||
for r in res5:
|
||||
res6[r['id']] = r['date_current']
|
||||
|
||||
for id in ids:
|
||||
dom = []
|
||||
if id in res6:
|
||||
dom = [('name','>=',res6[id]+' 00:00:00'),('name','<=',res6[id]+' 23:59:59')]
|
||||
ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'=',id)]+dom, limit=self._limit)
|
||||
for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
|
||||
res[r[self._fields_id]].append( r['id'] )
|
||||
return res
|
||||
|
||||
|
||||
class one2many_mod(fields.one2many):
|
||||
def get(self, cr, obj, ids, name, user=None, offset=0, context={}, values={}):
|
||||
res = {}
|
||||
for id in ids:
|
||||
res[id] = []
|
||||
|
||||
res5 = obj.read(cr, user, ids, ['date_current'], context)
|
||||
res6 = {}
|
||||
for r in res5:
|
||||
res6[r['id']] = r['date_current']
|
||||
|
||||
for id in ids:
|
||||
dom = []
|
||||
if id in res6:
|
||||
dom = [('date','=',res6[id])]
|
||||
ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'=',id)]+dom, limit=self._limit)
|
||||
for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
|
||||
res[r[self._fields_id]].append( r['id'] )
|
||||
return res
|
||||
|
||||
class hr_timesheet_sheet(osv.osv):
|
||||
_name = "hr_timesheet_sheet.sheet"
|
||||
_table = 'hr_timesheet_sheet_sheet'
|
||||
_order = "id desc"
|
||||
def _total_attendance_day(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)])
|
||||
if ids:
|
||||
result[day.id] = obj.read(cr, uid, ids, ['total_attendance'])[0]['total_attendance'] or 0.0
|
||||
return result
|
||||
_name = "hr_timesheet_sheet.sheet"
|
||||
_table = 'hr_timesheet_sheet_sheet'
|
||||
_order = "id desc"
|
||||
def _total_attendance_day(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)])
|
||||
if ids:
|
||||
result[day.id] = obj.read(cr, uid, ids, ['total_attendance'])[0]['total_attendance'] or 0.0
|
||||
return result
|
||||
|
||||
def _total_timesheet_day(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)])
|
||||
if ids:
|
||||
result[day.id] = obj.read(cr, uid, ids, ['total_timesheet'])[0]['total_timesheet'] or 0.0
|
||||
return result
|
||||
def _total_timesheet_day(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)])
|
||||
if ids:
|
||||
result[day.id] = obj.read(cr, uid, ids, ['total_timesheet'])[0]['total_timesheet'] or 0.0
|
||||
return result
|
||||
|
||||
def _total_difference_day(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)])
|
||||
if ids:
|
||||
result[day.id] = obj.read(cr, uid, ids, ['total_difference'])[0]['total_difference'] or 0.0
|
||||
return result
|
||||
def _total_difference_day(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id),('name','=',day.date_current)])
|
||||
if ids:
|
||||
result[day.id] = obj.read(cr, uid, ids, ['total_difference'])[0]['total_difference'] or 0.0
|
||||
return result
|
||||
|
||||
def _total_attendance(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id)])
|
||||
for o in obj.browse(cr, uid, ids, context):
|
||||
result[day.id] += o.total_attendance
|
||||
return result
|
||||
def _total_attendance(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id)])
|
||||
for o in obj.browse(cr, uid, ids, context):
|
||||
result[day.id] += o.total_attendance
|
||||
return result
|
||||
|
||||
def _total_timesheet(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id)])
|
||||
for o in obj.browse(cr, uid, ids, context):
|
||||
result[day.id] += o.total_timesheet
|
||||
return result
|
||||
def _total_timesheet(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id)])
|
||||
for o in obj.browse(cr, uid, ids, context):
|
||||
result[day.id] += o.total_timesheet
|
||||
return result
|
||||
|
||||
def _total_difference(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id)])
|
||||
for o in obj.browse(cr, uid, ids, context):
|
||||
result[day.id] += o.total_difference
|
||||
return result
|
||||
def _total_difference(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = 0.0
|
||||
obj = self.pool.get('hr_timesheet_sheet.sheet.day')
|
||||
ids = obj.search(cr, uid, [('sheet_id','=',day.id)])
|
||||
for o in obj.browse(cr, uid, ids, context):
|
||||
result[day.id] += o.total_difference
|
||||
return result
|
||||
|
||||
def date_previous(self, cr, uid, ids, context):
|
||||
for sheet in self.browse(cr, uid, ids, context):
|
||||
self.write(cr, uid, [sheet.id], {
|
||||
'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=-1)).strftime('%Y-%m-%d'),
|
||||
})
|
||||
return True
|
||||
def date_next(self, cr, uid, ids, context):
|
||||
for sheet in self.browse(cr, uid, ids, context):
|
||||
self.write(cr, uid, [sheet.id], {
|
||||
'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d'),
|
||||
})
|
||||
return True
|
||||
def date_previous(self, cr, uid, ids, context):
|
||||
for sheet in self.browse(cr, uid, ids, context):
|
||||
self.write(cr, uid, [sheet.id], {
|
||||
'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=-1)).strftime('%Y-%m-%d'),
|
||||
})
|
||||
return True
|
||||
def date_next(self, cr, uid, ids, context):
|
||||
for sheet in self.browse(cr, uid, ids, context):
|
||||
self.write(cr, uid, [sheet.id], {
|
||||
'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d'),
|
||||
})
|
||||
return True
|
||||
|
||||
def sign_in(self, cr, uid, ids, context):
|
||||
emp_obj = self.pool.get('hr.employee')
|
||||
emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
|
||||
success = emp_obj.sign_in(cr, uid, emp_id)
|
||||
self.pool.get('hr.attendance').write(cr, uid, [success], {'sheet_id': ids[0]})
|
||||
return True
|
||||
def sign_in(self, cr, uid, ids, context):
|
||||
emp_obj = self.pool.get('hr.employee')
|
||||
emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
|
||||
success = emp_obj.sign_in(cr, uid, emp_id)
|
||||
self.pool.get('hr.attendance').write(cr, uid, [success], {'sheet_id': ids[0]})
|
||||
return True
|
||||
|
||||
def sign_out(self, cr, uid, ids, context):
|
||||
emp_obj = self.pool.get('hr.employee')
|
||||
emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
|
||||
success = emp_obj.sign_out(cr, uid, emp_id)
|
||||
self.pool.get('hr.attendance').write(cr, uid, [success], {'sheet_id': ids[0]})
|
||||
return True
|
||||
def sign_out(self, cr, uid, ids, context):
|
||||
emp_obj = self.pool.get('hr.employee')
|
||||
emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
|
||||
success = emp_obj.sign_out(cr, uid, emp_id)
|
||||
self.pool.get('hr.attendance').write(cr, uid, [success], {'sheet_id': ids[0]})
|
||||
return True
|
||||
|
||||
|
||||
_columns = {
|
||||
'name': fields.char('Description', size=64, select=1),
|
||||
'user_id': fields.many2one('res.users', 'User', required=True, select=1),
|
||||
'date_from': fields.date('Date from', required=True, select=1),
|
||||
'date_to': fields.date('Date to', required=True, select=1),
|
||||
'date_current': fields.date('Current date', required=True),
|
||||
'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'sheet_id', 'Timesheets', domain=[('date','=',time.strftime('%Y-%m-%d'))], readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'attendances_ids' : fields.one2many('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'state' : fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done')], 'state', select=True, required=True, readonly=True),
|
||||
'total_attendance_day': fields.function(_total_attendance_day, method=True, string='Total Attendance'),
|
||||
'total_timesheet_day': fields.function(_total_timesheet_day, method=True, string='Total Timesheet'),
|
||||
'total_difference_day': fields.function(_total_difference_day, method=True, string='Difference'),
|
||||
'total_attendance': fields.function(_total_attendance, method=True, string='Total Attendance'),
|
||||
'total_timesheet': fields.function(_total_timesheet, method=True, string='Total Timesheet'),
|
||||
'total_difference': fields.function(_total_difference, method=True, string='Difference'),
|
||||
'period_ids': fields.one2many('hr_timesheet_sheet.sheet.day', 'sheet_id', 'Period', readonly=True),
|
||||
}
|
||||
_defaults = {
|
||||
'user_id': lambda self,cr,uid,c: uid,
|
||||
'date_from' : lambda *a:time.strftime('%Y-%m-01'),
|
||||
'date_current' : lambda *a:time.strftime('%Y-%m-%d'),
|
||||
'date_to' : lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+1,day=1,days=-1)).strftime('%Y-%m-%d'),
|
||||
'state': lambda *a: 'draft'
|
||||
}
|
||||
_columns = {
|
||||
'name': fields.char('Description', size=64, select=1),
|
||||
'user_id': fields.many2one('res.users', 'User', required=True, select=1),
|
||||
'date_from': fields.date('Date from', required=True, select=1),
|
||||
'date_to': fields.date('Date to', required=True, select=1),
|
||||
'date_current': fields.date('Current date', required=True),
|
||||
'timesheet_ids' : one2many_mod('hr.analytic.timesheet', 'sheet_id', 'Timesheets', domain=[('date','=',time.strftime('%Y-%m-%d'))], readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'state' : fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done')], 'state', select=True, required=True, readonly=True),
|
||||
'total_attendance_day': fields.function(_total_attendance_day, method=True, string='Total Attendance'),
|
||||
'total_timesheet_day': fields.function(_total_timesheet_day, method=True, string='Total Timesheet'),
|
||||
'total_difference_day': fields.function(_total_difference_day, method=True, string='Difference'),
|
||||
'total_attendance': fields.function(_total_attendance, method=True, string='Total Attendance'),
|
||||
'total_timesheet': fields.function(_total_timesheet, method=True, string='Total Timesheet'),
|
||||
'total_difference': fields.function(_total_difference, method=True, string='Difference'),
|
||||
'period_ids': fields.one2many('hr_timesheet_sheet.sheet.day', 'sheet_id', 'Period', readonly=True),
|
||||
}
|
||||
_defaults = {
|
||||
'user_id': lambda self,cr,uid,c: uid,
|
||||
'date_from' : lambda *a:time.strftime('%Y-%m-01'),
|
||||
'date_current' : lambda *a:time.strftime('%Y-%m-%d'),
|
||||
'date_to' : lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+1,day=1,days=-1)).strftime('%Y-%m-%d'),
|
||||
'state': lambda *a: 'draft'
|
||||
}
|
||||
hr_timesheet_sheet()
|
||||
|
||||
class hr_timesheet_line(osv.osv):
|
||||
_inherit = "account.analytic.line"
|
||||
_columns = {
|
||||
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', ondelete='set null')
|
||||
}
|
||||
_default = {
|
||||
'sheet_id': lambda *a: False
|
||||
}
|
||||
def create(self, cr, uid, vals, *args, **kwargs):
|
||||
if 'sheet_id' in vals:
|
||||
ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])
|
||||
if ts.state<>'draft':
|
||||
raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !')
|
||||
return super(hr_timesheet_line,self).create(cr, uid, vals, *args, **kwargs)
|
||||
def unlink(self, cr, uid, ids, *args, **kwargs):
|
||||
self._check(cr, uid, ids)
|
||||
return super(hr_timesheet_line,self).unlink(cr, uid, ids,*args, **kwargs)
|
||||
def write(self, cr, uid, ids, *args, **kwargs):
|
||||
print '2', args, kwargs
|
||||
self._check(cr, uid, ids)
|
||||
return super(hr_timesheet_line,self).write(cr, uid, ids,*args, **kwargs)
|
||||
def _check(self, cr, uid, ids):
|
||||
for att in self.browse(cr, uid, ids):
|
||||
print att.sheet_id
|
||||
if att.sheet_id and att.sheet_id.state<>'draft':
|
||||
raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !')
|
||||
return True
|
||||
_inherit = "account.analytic.line"
|
||||
_columns = {
|
||||
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', ondelete='set null')
|
||||
}
|
||||
_default = {
|
||||
'sheet_id': lambda *a: False
|
||||
}
|
||||
def create(self, cr, uid, vals, *args, **kwargs):
|
||||
if 'sheet_id' in vals:
|
||||
ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])
|
||||
if ts.state<>'draft':
|
||||
raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !')
|
||||
return super(hr_timesheet_line,self).create(cr, uid, vals, *args, **kwargs)
|
||||
def unlink(self, cr, uid, ids, *args, **kwargs):
|
||||
self._check(cr, uid, ids)
|
||||
return super(hr_timesheet_line,self).unlink(cr, uid, ids,*args, **kwargs)
|
||||
def write(self, cr, uid, ids, *args, **kwargs):
|
||||
print '2', args, kwargs
|
||||
self._check(cr, uid, ids)
|
||||
return super(hr_timesheet_line,self).write(cr, uid, ids,*args, **kwargs)
|
||||
def _check(self, cr, uid, ids):
|
||||
for att in self.browse(cr, uid, ids):
|
||||
print att.sheet_id
|
||||
if att.sheet_id and att.sheet_id.state<>'draft':
|
||||
raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !')
|
||||
return True
|
||||
hr_timesheet_line()
|
||||
|
||||
class hr_attendance(osv.osv):
|
||||
_inherit = "hr.attendance"
|
||||
_columns = {
|
||||
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', ondelete='set null')
|
||||
}
|
||||
_default = {
|
||||
'sheet_id': lambda *a: False
|
||||
}
|
||||
def create(self, cr, uid, vals, *args, **kwargs):
|
||||
if 'sheet_id' in vals:
|
||||
ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])
|
||||
if ts.state<>'draft':
|
||||
raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !')
|
||||
return super(hr_attendance,self).create(cr, uid, vals, *args, **kwargs)
|
||||
def unlink(self, cr, uid, ids, *args, **kwargs):
|
||||
self._check(cr, uid, ids)
|
||||
return super(hr_attendance,self).unlink(cr, uid, ids,*args, **kwargs)
|
||||
def write(self, cr, uid, ids, *args, **kwargs):
|
||||
print '1'
|
||||
self._check(cr, uid, ids)
|
||||
return super(hr_attendance,self).write(cr, uid, ids,*args, **kwargs)
|
||||
def _check(self, cr, uid, ids):
|
||||
for att in self.browse(cr, uid, ids):
|
||||
if att.sheet_id and att.sheet_id.state<>'draft':
|
||||
raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !')
|
||||
return True
|
||||
_inherit = "hr.attendance"
|
||||
_columns = {
|
||||
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', ondelete='set null')
|
||||
}
|
||||
_default = {
|
||||
'sheet_id': lambda *a: False
|
||||
}
|
||||
def create(self, cr, uid, vals, *args, **kwargs):
|
||||
if 'sheet_id' in vals:
|
||||
ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])
|
||||
if ts.state<>'draft':
|
||||
raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !')
|
||||
return super(hr_attendance,self).create(cr, uid, vals, *args, **kwargs)
|
||||
def unlink(self, cr, uid, ids, *args, **kwargs):
|
||||
self._check(cr, uid, ids)
|
||||
return super(hr_attendance,self).unlink(cr, uid, ids,*args, **kwargs)
|
||||
def write(self, cr, uid, ids, *args, **kwargs):
|
||||
print '1'
|
||||
self._check(cr, uid, ids)
|
||||
return super(hr_attendance,self).write(cr, uid, ids,*args, **kwargs)
|
||||
def _check(self, cr, uid, ids):
|
||||
for att in self.browse(cr, uid, ids):
|
||||
if att.sheet_id and att.sheet_id.state<>'draft':
|
||||
raise osv.except_osv('Error !', 'You can not modify an entry in a confirmed timesheet !')
|
||||
return True
|
||||
hr_attendance()
|
||||
|
||||
class hr_timesheet_sheet_sheet_day(osv.osv):
|
||||
_name = "hr_timesheet_sheet.sheet.day"
|
||||
_description = "Timesheets by period"
|
||||
_auto = False
|
||||
def _total_difference(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = day.total_attendance-day.total_timesheet
|
||||
return result
|
||||
_name = "hr_timesheet_sheet.sheet.day"
|
||||
_description = "Timesheets by period"
|
||||
_auto = False
|
||||
def _total_difference(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
result[day.id] = day.total_attendance-day.total_timesheet
|
||||
return result
|
||||
|
||||
def _total_attendance(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
cr.execute('select name,action from hr_attendance where name>=%s and name<=%s order by name', (day.name, day.name+' 23:59:59'))
|
||||
attendences = cr.dictfetchall()
|
||||
wh = 0
|
||||
if attendences and attendences[0]['action'] == 'sign_out':
|
||||
attendences.insert(0, {'name': day.name+' 00:00:00', 'action':'sign_in'})
|
||||
if attendences and attendences[-1]['action'] == 'sign_in':
|
||||
attendences.append({'name': day.name+' 23:59:59', 'action':'sign_out'})
|
||||
for att in attendences:
|
||||
dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
|
||||
if att['action'] == 'sign_out':
|
||||
wh += (dt - ldt).hours
|
||||
ldt = dt
|
||||
result[day.id] = wh
|
||||
print result
|
||||
return result
|
||||
_order='name'
|
||||
_columns = {
|
||||
'name': fields.date('Date', readonly=True),
|
||||
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True, select="1"),
|
||||
'total_timesheet': fields.float('Project Timesheet', readonly=True),
|
||||
'total_attendance': fields.function(_total_attendance, method=True, string='Attendance', readonly=True),
|
||||
'total_difference': fields.function(_total_difference, method=True, string='Difference', readonly=True),
|
||||
}
|
||||
def init(self, cr):
|
||||
cr.execute("""
|
||||
create or replace view hr_timesheet_sheet_sheet_day as (
|
||||
select
|
||||
min(case when l.oid is not null then l.oid else a.oid end) as id,
|
||||
min(case when l.date is not null then l.date else a.name::date end) as name,
|
||||
(case when l.sheet_id is not null then l.sheet_id else a.sheet_id end) as sheet_id,
|
||||
sum(l.unit_amount) as total_timesheet
|
||||
from
|
||||
account_analytic_line l
|
||||
full outer join
|
||||
hr_attendance a on ((a.name::date=l.date) and l.sheet_id=a.sheet_id)
|
||||
group by l.date,a.name::date, l.sheet_id,a.sheet_id
|
||||
)""")
|
||||
def _total_attendance(self, cr, uid, ids, name, args, context):
|
||||
result = {}
|
||||
for day in self.browse(cr, uid, ids, context):
|
||||
cr.execute('select name,action from hr_attendance where name>=%s and name<=%s order by name', (day.name, day.name+' 23:59:59'))
|
||||
attendences = cr.dictfetchall()
|
||||
wh = 0
|
||||
if attendences and attendences[0]['action'] == 'sign_out':
|
||||
attendences.insert(0, {'name': day.name+' 00:00:00', 'action':'sign_in'})
|
||||
if attendences and attendences[-1]['action'] == 'sign_in':
|
||||
attendences.append({'name': day.name+' 23:59:59', 'action':'sign_out'})
|
||||
for att in attendences:
|
||||
dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
|
||||
if att['action'] == 'sign_out':
|
||||
wh += (dt - ldt).hours
|
||||
ldt = dt
|
||||
result[day.id] = wh
|
||||
print result
|
||||
return result
|
||||
_order='name'
|
||||
_columns = {
|
||||
'name': fields.date('Date', readonly=True),
|
||||
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True, select="1"),
|
||||
'total_timesheet': fields.float('Project Timesheet', readonly=True),
|
||||
'total_attendance': fields.function(_total_attendance, method=True, string='Attendance', readonly=True),
|
||||
'total_difference': fields.function(_total_difference, method=True, string='Difference', readonly=True),
|
||||
}
|
||||
def init(self, cr):
|
||||
cr.execute("""create or replace view hr_timesheet_sheet_sheet_day as
|
||||
(
|
||||
select
|
||||
min(l.oid) as id,
|
||||
l.date as name,
|
||||
l.sheet_id as sheet_id,
|
||||
sum(l.unit_amount) as total_timesheet
|
||||
from
|
||||
account_analytic_line l
|
||||
group by l.date, l.sheet_id
|
||||
) union (
|
||||
select
|
||||
min(a.oid) as id,
|
||||
a.name::date as name,
|
||||
a.sheet_id as sheet_id,
|
||||
0.0 as total_timesheet
|
||||
from
|
||||
hr_attendance a
|
||||
where a.name::date not in (select distinct date from account_analytic_line)
|
||||
group by a.name::date, a.sheet_id
|
||||
)""")
|
||||
hr_timesheet_sheet_sheet_day()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
<field name="date_to" />
|
||||
<field name="name" />
|
||||
<field name="total_attendance"/>
|
||||
<field name="total_timesheet"/>
|
||||
<field name="total_difference"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
|
|
@ -34,9 +35,9 @@
|
|||
<page string="Daily view">
|
||||
<group col="4" colspan="2">
|
||||
<field name="date_current" nolabel="1"/>
|
||||
<button string="<<" name="date_previous" type="object"/>
|
||||
<button string="GO" name="reload"/>
|
||||
<button string=">>" name="date_next" type="object"/>
|
||||
<button icon="STOCK_MEDIA_PREVIOUS" string="" name="date_previous" type="object"/>
|
||||
<button icon="STOCK_JUMP_TO" string="" name="reload"/>
|
||||
<button icon="STOCK_MEDIA_NEXT" string="" name="date_next" type="object"/>
|
||||
</group>
|
||||
<button string="Sign In" name="sign_in" type="object"/>
|
||||
<button string="Sign Out" name="sign_out" type="object"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue