From f6831fba1370e569299c63f592fcd2a09a1dbc76 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 27 Sep 2023 14:40:57 +0530 Subject: [PATCH] chore: hide internal fields and better painting logic for heatmap --- .../bisect_accounting_statements.js | 15 ++++++++---- .../bisect_accounting_statements.json | 24 ++++++++++++------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js index 1c1e3cc6ca..c00e49d380 100644 --- a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js +++ b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js @@ -28,11 +28,18 @@ frappe.ui.form.on("Bisect Accounting Statements", { // milliseconds in a day let msiad=24*60*60*1000; let datapoints = {}; - let fr_dt = new Date(frm.doc.current_from_date).getTime(); - let to_dt = new Date(frm.doc.current_to_date).getTime(); + let fr_dt = new Date(frm.doc.from_date).getTime(); + let to_dt = new Date(frm.doc.to_date).getTime(); + let bisect_start = new Date(frm.doc.current_from_date).getTime(); + let bisect_end = new Date(frm.doc.current_to_date).getTime(); + for(let x=fr_dt; x <= to_dt; x+=msiad){ let epoch_in_seconds = x/1000; - datapoints[epoch_in_seconds] = 1; + if ((bisect_start <= x) && (x <= bisect_end )) { + datapoints[epoch_in_seconds] = 1.0; + } else { + datapoints[epoch_in_seconds] = 0.0; + } } console.log(datapoints); @@ -45,7 +52,7 @@ frappe.ui.form.on("Bisect Accounting Statements", { end: new Date(frm.doc.to_date), }, countLabel: 'Difference', - discreteDomains: 1 + discreteDomains: 1, }); }, bisect_left(frm) { diff --git a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json index 9a7242fe92..84d021d7da 100644 --- a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json +++ b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json @@ -58,23 +58,25 @@ { "fieldname": "current_node", "fieldtype": "Link", - "hidden": 1, "label": "Current Node", "options": "Nodes" }, { "fieldname": "section_break_hmsy", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "hidden": 1 }, { "fieldname": "current_from_date", "fieldtype": "Datetime", - "label": "Current From Date" + "label": "Current From Date", + "read_only": 1 }, { "fieldname": "current_to_date", "fieldtype": "Datetime", - "label": "Current To Date" + "label": "Current To Date", + "read_only": 1 }, { "fieldname": "column_break_uqyd", @@ -87,17 +89,20 @@ { "fieldname": "p_l_summary", "fieldtype": "Data", - "label": "P&L Summary" + "label": "P&L Summary", + "read_only": 1 }, { "fieldname": "b_s_summary", "fieldtype": "Data", - "label": "Balance Sheet Summary" + "label": "Balance Sheet Summary", + "read_only": 1 }, { "fieldname": "difference", "fieldtype": "Data", - "label": "Difference" + "label": "Difference", + "read_only": 1 }, { "fieldname": "column_break_aivo", @@ -123,7 +128,8 @@ }, { "fieldname": "section_break_8ph9", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "hidden": 1 }, { "fieldname": "bisect_heatmap", @@ -135,7 +141,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2023-09-27 12:10:40.044935", + "modified": "2023-09-27 14:32:09.962067", "modified_by": "Administrator", "module": "Accounts", "name": "Bisect Accounting Statements",