Accept Merge Request #262: (feature/创建工作日历代码测试 -> develop)
Merge Request: 添加工作日历设置创建工作日历时的输出日志 Created By: @禹翔辉 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/262?initial=true
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import logging
|
||||
from datetime import datetime, timedelta
|
||||
from odoo import models, fields, api
|
||||
|
||||
@@ -111,6 +112,7 @@ class WorkLogSetting(models.Model):
|
||||
创建记录时,生成工作日历
|
||||
"""
|
||||
record = super(WorkLogSetting, self).create(vals)
|
||||
logging.info("工作日历设置【新建】记录时,创建工作日历记录!!!")
|
||||
record.generate_work_calendar()
|
||||
return record
|
||||
|
||||
@@ -121,6 +123,7 @@ class WorkLogSetting(models.Model):
|
||||
# 先删除之前创建的工作日历事件记录
|
||||
self.env['sf.work.schedule.calendar'].search([('calendar_code', '=', self.code)]).unlink()
|
||||
result = super(WorkLogSetting, self).write(vals)
|
||||
logging.info("工作日历设置【更新】记录时,创建工作日历记录!!!")
|
||||
self.generate_work_calendar()
|
||||
return result
|
||||
|
||||
@@ -128,12 +131,14 @@ class WorkLogSetting(models.Model):
|
||||
"""
|
||||
生成工作日历
|
||||
"""
|
||||
logging.info('开始创建工作日历记录')
|
||||
self.ensure_one()
|
||||
# start_date = date.today() # 开始日期
|
||||
# end_date = start_date + timedelta(days=365) # 结束日期
|
||||
# 获取本年第一天和最后一天
|
||||
start_date = datetime.now().replace(month=1, day=1).date()
|
||||
end_date = datetime.now().replace(month=12, day=31).date()
|
||||
logging.info(f'start_date: {start_date} , end_date: {end_date}')
|
||||
# 休息日列表
|
||||
rest_days = self.day_off_ids.mapped('name')
|
||||
for single_date in self.daterange(start_date, end_date):
|
||||
@@ -144,6 +149,8 @@ class WorkLogSetting(models.Model):
|
||||
'name': '休息日',
|
||||
'name_id': self.id,
|
||||
'date_time': single_date})
|
||||
logging.info('创建一条工作日历记录,休息时间: %s' % is_workday)
|
||||
logging.info('工作日历记录创建完成')
|
||||
|
||||
@staticmethod
|
||||
def daterange(start_date, end_date):
|
||||
|
||||
Reference in New Issue
Block a user