From e557e455b1cb9863e25789093fb0c6839354fca9 Mon Sep 17 00:00:00 2001 From: venkataakhil Date: Thu, 16 Nov 2023 12:12:54 +0530 Subject: [PATCH] Kilometer mapping fix reload issue --- .../kilometer_mapping/kilometer_mapping.js | 10 +- .../kilometer_mapping/kilometer_mapping.py | 111 ++++++++++-------- 2 files changed, 64 insertions(+), 57 deletions(-) diff --git a/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.js b/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.js index a11dd7d..7e31858 100644 --- a/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.js +++ b/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.js @@ -56,10 +56,7 @@ frappe.ui.form.on('Kilometer Mapping', { }, validate: function (frm) { - if (frm.doc.__unsaved == 1){ - frm.doc.workflow_state = "Draft"; - } - + frm.doc.kilometer_filter = "All"; if (frm.doc.kilometer_filter == "All") { frm.get_field('config_kilometer').grid.static_rows = false; @@ -72,7 +69,7 @@ frappe.ui.form.on('Kilometer Mapping', { }, refresh: function (frm) { - //custom duplicate button + //custom button frm.add_custom_button(__("Duplicate Data"), function () { let d = new frappe.ui.Dialog({ title: 'Choose the variant', @@ -101,11 +98,11 @@ frappe.ui.form.on('Kilometer Mapping', { if (r.message && r.message['status'] == "success") { cur_frm.refresh_fields("config_kilometer"); frm.save() - cur_frm.reload_doc(); frappe.show_alert({ message: __('Saved'), indicator: 'green' }, 5); + frm.refresh() } } }) @@ -122,6 +119,7 @@ frappe.ui.form.on('Kilometer Mapping', { d.show(); setTimeout(function mysam() { + console.log("jiiii", $('.modal-dialog').find('.custom-actions').html('

Are you sure to update the kilometer mapping?

')) $('.modal-dialog').find('.custom-actions').html('

Are you sure to update the kilometer mapping?

') } , 300); diff --git a/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.py b/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.py index e6e4256..09b7d60 100644 --- a/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.py +++ b/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.py @@ -5,63 +5,72 @@ import frappe from frappe.model.document import Document import sys from frappe import _ -sys.tracebacklimit=0 -current_db_name = frappe.conf.get("db_name") +sys.tracebacklimit = 0 + + class KilometerMapping(Document): - def onload(self): - ###Kilometer mapping config table idx allignment - if(self.config_kilometer): - idx = 0 - for x in self.get("config_kilometer"): - idx += 1 - x.idx = idx + def onload(self): + # Kilometer mapping config table idx allignment + if (self.config_kilometer): + idx = 0 + for x in self.get("config_kilometer"): + idx += 1 + x.idx = idx + + @frappe.whitelist() def get_system(doc): - - system_map = frappe.db.sql("""select name from {0}.`tabSystem Mapping` where variant_mapping='{1}'""".format(current_db_name,doc),as_dict=True) - if system_map: - for s in system_map: - doc = frappe.get_doc("System Mapping",s.name) - system = frappe.db.sql("""select sub_systems,mat from {0}.`tabSystem Mapping_Sub System` where parent = '{1}' and procedure_is_published = '0'""".format(current_db_name,s.name),as_dict=True) - return system - + current_db_name = frappe.conf.get("db_name") + system_map = frappe.db.sql("""select name from {0}.`tabSystem Mapping` where variant_mapping='{1}'""".format( + current_db_name, doc), as_dict=True) + if system_map: + for s in system_map: + doc = frappe.get_doc("System Mapping", s.name) + system = frappe.db.sql("""select sub_systems,mat from {0}.`tabSystem Mapping_Sub System` where parent = '{1}' and procedure_is_published = '0'""".format( + current_db_name, s.name), as_dict=True) + return system + + @frappe.whitelist() def get_subsystem(doc): - current_db_name = frappe.conf.get("db_name") - system_map = frappe.db.sql("""select name from {0}.`tabSystem Mapping` where variant_mapping='{1}'""".format(current_db_name,doc),as_dict=True) - if system_map: - for s in system_map: - doc = frappe.get_doc("System Mapping",s.name) - sub_system = frappe.db.sql("""select sub_systems,mat,idx from {0}.`tabSystem Mapping_Sub System` where parent = '{1}' and procedure_is_published = '0'""".format(current_db_name,s.name),as_dict=True) - return sub_system + current_db_name = frappe.conf.get("db_name") + system_map = frappe.db.sql("""select name from {0}.`tabSystem Mapping` where variant_mapping='{1}'""".format( + current_db_name, doc), as_dict=True) + if system_map: + for s in system_map: + doc = frappe.get_doc("System Mapping", s.name) + sub_system = frappe.db.sql("""select sub_systems,mat,idx from {0}.`tabSystem Mapping_Sub System` where parent = '{1}' and procedure_is_published = '0'""".format( + current_db_name, s.name), as_dict=True) + return sub_system @frappe.whitelist() -def update_duplicate_km(doc,kilometer): - - km = frappe.get_doc("Kilometer Mapping",doc) - output = frappe.db.sql("""select kilometer,mat,sub_systems,row_name from `tabKilometer Mapping_Items` where parent = '{0}' and kilometer = '{1}' order by kilometer""".format(doc,kilometer),as_dict=True) - # frappe.msgprint(str(output)) - for data in output: - # frappe.msgprint(str(data['mat'])) - km.append('duplicate_kilometer_mapping_items', { - 'kilometer': data['kilometer'], - 'mat': data['mat'], - 'sub_systems': data['sub_systems'], - 'row_name': data['row_name'] - }) - km.save(ignore_permissions=True) - - - +def update_duplicate_km(doc, kilometer): + + km = frappe.get_doc("Kilometer Mapping", doc) + output = frappe.db.sql("""select kilometer,mat,sub_systems,row_name from `tabKilometer Mapping_Items` where parent = '{0}' and kilometer = '{1}' order by kilometer""".format( + doc, kilometer), as_dict=True) + # frappe.msgprint(str(output)) + for data in output: + # frappe.msgprint(str(data['mat'])) + km.append('duplicate_kilometer_mapping_items', { + 'kilometer': data['kilometer'], + 'mat': data['mat'], + 'sub_systems': data['sub_systems'], + 'row_name': data['row_name'] + }) + km.save(ignore_permissions=True) + + @frappe.whitelist() -def get_config_kilometer(doc,docname): - res = frappe.db.sql(f"""select kilometer,mat,sub_systems,applicable,row_name from `tabKilometer Mapping_Items` where parent='{doc}'""",as_dict=1) - ress = frappe.get_doc("Kilometer Mapping",docname) - ress.config_kilometer = [] - for d in res: - ress.append("config_kilometer",d) - ress.add_comment(text=_("data added"+str(res))) - ress.save() - frappe.db.commit() - return {"status":"success"} +def get_config_kilometer(doc, docname): + res = frappe.db.sql( + f"""select kilometer,mat,sub_systems,applicable,row_name from `tabKilometer Mapping_Items` where parent='{doc}'""", as_dict=1) + ress = frappe.get_doc("Kilometer Mapping", docname) + ress.config_kilometer = [] + for d in res: + ress.append("config_kilometer", d) + ress.add_comment(text=_("data added"+str(res))) + ress.save() + frappe.db.commit() + return {"status": "success"}