From 917dfdae78b799e9bbc59e4e83958c124ea09d0d Mon Sep 17 00:00:00 2001
From: phot0n <ritwikpuri5678@gmail.com>
Date: Tue, 22 Nov 2022 15:25:03 +0530
Subject: [PATCH] refactor(minor): use virtual docfield for report_start_time -
 and renamed it to queued_at

* chore: rename Report End Time label to Finished At
---
 .../prepared_report/prepared_report.json      | 19 ++++++++++---------
 .../prepared_report/prepared_report.py        |  5 ++++-
 .../prepared_report/test_prepared_report.py   |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/frappe/core/doctype/prepared_report/prepared_report.json b/frappe/core/doctype/prepared_report/prepared_report.json
index 3a89b7030b..6379bb15db 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.json
+++ b/frappe/core/doctype/prepared_report/prepared_report.json
@@ -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",
diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index b129266dbd..64a68fdc3e 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -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(
diff --git a/frappe/core/doctype/prepared_report/test_prepared_report.py b/frappe/core/doctype/prepared_report/test_prepared_report.py
index 9426cebff4..6fd189b960 100644
--- a/frappe/core/doctype/prepared_report/test_prepared_report.py
+++ b/frappe/core/doctype/prepared_report/test_prepared_report.py
@@ -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)