audrius/reporting-engine
1
0
Fork 1
mirror of https://github.com/OCA/reporting-engine.git synced 2025-02-16 16:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #904 into 12.0

Browse Source 
Signed-off-by HviorForgeFlow
This commit is contained in:
OCA-git-bot
2024-07-07 08:49:54 +00:00
parent 0992caaef2 27e4d3b6f3
commit 855984897f
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
report_async/models/report_async.py
View File

@@ -70,8 +70,14 @@ class ReportAsync(models.Model):
compute='_compute_file',
help="List all files created by this report background process",
)
schedule_time = fields.Char(string='Schedule time')
schedule_time = fields.Char(
string='Schedule Time',
help="Time when the job will be executed",
)
schedule_date = fields.Date(
string='Schedule Date',
help="Date when the job will be executed",
)
@api.multi
def _compute_job(self):
@@ -167,9 +173,17 @@ class ReportAsync(models.Model):
force_send=False)
def _get_next_schedule_time(self):
target_time = datetime.strptime(self.schedule_time, "%H:%M").time()
now = fields.Datetime.now()
target_datetime = datetime.combine(now.date(), target_time)
if now.time() > target_time:
target_datetime += timedelta(days=1)
target_time = datetime.strptime(self.schedule_time, "%H:%M").time() \
if self.schedule_time else now.time()
if self.schedule_date:
target_datetime = datetime.combine(self.schedule_date, target_time)
if now > target_datetime:
raise UserError(_('The scheduled time must be in the future.'))
else:
target_datetime = datetime.combine(now.date(), target_time)
if now > target_datetime:
target_datetime += timedelta(days=1)
return target_datetime

2
report_async/views/report_async.xml
View File

@@ -75,6 +75,8 @@
attrs="{'invisible': [('allow_async', '=', False)]}"/>
<field name="schedule_time" placeholder="23:30"
attrs="{'invisible': [('allow_async', '=', False)]}"/>
<field name="schedule_date" widget="date"
attrs="{'invisible': [('allow_async', '=', False)]}"/>
</group>
<group>
<field name="job_status"