refactor(minor): use virtual docfield for report_start_time - and renamed it to queued_at
* chore: rename Report End Time label to Finished At
This commit is contained in:
parent
08bae70908
commit
917dfdae78
3 changed files with 15 additions and 11 deletions
|
|
@ -11,7 +11,7 @@
|
|||
"queued_by",
|
||||
"job_id",
|
||||
"column_break_4",
|
||||
"report_start_time",
|
||||
"queued_at",
|
||||
"report_end_time",
|
||||
"section_break_7",
|
||||
"error_message",
|
||||
|
|
@ -42,16 +42,10 @@
|
|||
"fieldname": "column_break_4",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "report_start_time",
|
||||
"fieldtype": "Datetime",
|
||||
"label": "Report Start Time",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "report_end_time",
|
||||
"fieldtype": "Datetime",
|
||||
"label": "Report End Time",
|
||||
"label": "Finished At",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
|
|
@ -97,11 +91,18 @@
|
|||
"is_virtual": 1,
|
||||
"label": "Queued By",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "queued_at",
|
||||
"fieldtype": "Datetime",
|
||||
"is_virtual": 1,
|
||||
"label": "Queued At",
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"in_create": 1,
|
||||
"links": [],
|
||||
"modified": "2022-11-22 15:14:40.205678",
|
||||
"modified": "2022-11-22 15:22:45.523427",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Core",
|
||||
"name": "Prepared Report",
|
||||
|
|
|
|||
|
|
@ -20,6 +20,10 @@ class PreparedReport(Document):
|
|||
def queued_by(self):
|
||||
return self.owner
|
||||
|
||||
@property
|
||||
def queued_at(self):
|
||||
return self.creation
|
||||
|
||||
@staticmethod
|
||||
def clear_old_logs(days=30):
|
||||
prepared_reports_to_delete = frappe.get_all(
|
||||
|
|
@ -32,7 +36,6 @@ class PreparedReport(Document):
|
|||
|
||||
def before_insert(self):
|
||||
self.status = "Queued"
|
||||
self.report_start_time = frappe.utils.now()
|
||||
|
||||
def after_insert(self):
|
||||
enqueue(
|
||||
|
|
|
|||
|
|
@ -24,4 +24,4 @@ class TestPreparedReport(FrappeTestCase):
|
|||
|
||||
def test_for_creation(self):
|
||||
self.assertTrue("QUEUED" == self.prepared_report_doc.status.upper())
|
||||
self.assertTrue(self.prepared_report_doc.report_start_time)
|
||||
self.assertTrue(self.prepared_report_doc.queued_at)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue