diff --git a/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.js b/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.js index c4c5a37..f1ffbb3 100644 --- a/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.js +++ b/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.js @@ -56,7 +56,10 @@ 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; @@ -69,7 +72,7 @@ frappe.ui.form.on('Kilometer Mapping', { }, refresh: function (frm) { - //custom button + //custom duplicate button frm.add_custom_button(__("Duplicate Data"), function () { let d = new frappe.ui.Dialog({ title: 'Choose the variant', @@ -96,16 +99,19 @@ frappe.ui.form.on('Kilometer Mapping', { }, callback: function (r) { if (r.message && r.message['status'] == "success") { + frm.doc.workflow_state = 'Draft'; + frm.set_value('workflow_state','Draft') cur_frm.refresh_fields("config_kilometer"); + cur_frm.refresh_fields("workflow_state"); frm.save() frappe.show_alert({ message: __('Saved'), indicator: 'green' }, 5); - frm.refresh() - - + // frm.refresh() + // frm.refresh_fields("config_kilometer"); + cur_frm.reload_doc(); } } }) @@ -122,7 +128,6 @@ 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 26ffeef..a5d885c 100644 --- a/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.py +++ b/smart_service/transactions/doctype/kilometer_mapping/kilometer_mapping.py @@ -6,7 +6,7 @@ from frappe.model.document import Document import sys from frappe import _ sys.tracebacklimit=0 - +current_db_name = frappe.conf.get("db_name") class KilometerMapping(Document): def onload(self): ###Kilometer mapping config table idx allignment @@ -15,10 +15,9 @@ class KilometerMapping(Document): for x in self.get("config_kilometer"): idx += 1 x.idx = idx - @frappe.whitelist() def get_system(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: @@ -64,7 +63,10 @@ def get_config_kilometer(doc,docname): ress.append("config_kilometer",d) ress.add_comment(text=_("data added"+str(res))) ress.save() + frappe.db.sql(f"""update `tabKilometer Mapping` set workflow_state = 'Draft' where name = '{docname}' + """) frappe.db.commit() + return {"status":"success"} diff --git a/smart_service/transactions/doctype/publish/publish.py b/smart_service/transactions/doctype/publish/publish.py index a986c6c..7461f67 100644 --- a/smart_service/transactions/doctype/publish/publish.py +++ b/smart_service/transactions/doctype/publish/publish.py @@ -215,18 +215,16 @@ def update_qwik_published_docs(self): def update_publish_mapping(vehicle, variant, language, module, publish_type): # frappe.set_user('Administrator') try: - frappe.log_error("calling module", str(module)) if module == 'Repair service': pub_data = frappe.db.get_list('Module Publish Mapping', filters={ "vehicle": vehicle, "language": language, "publish_type": publish_type }, fields=['name']) - frappe.log_error("pub_data", str(pub_data)) + if len(pub_data) > 0: for d in pub_data: if d['name']: - frappe.log_error("kkkkkkkkkk") frappe.db.sql( f"""UPDATE `tabModule Publish Mapping` set repairservice_check_sheet='1',publish_type='{publish_type}' where name ='{d['name']}'""")