Browse Source

MSt fixes

version2
venkataakhil 1 year ago
parent
commit
a996a67d4a
  1. 2
      smart_service/apis/v2/master.py
  2. 30
      smart_service/phase_2/doctype/special_tool_information/special_tool_information.json
  3. 2
      smart_service/transactions/doctype/publish/publish.js

2
smart_service/apis/v2/master.py

@ -270,7 +270,7 @@ def get_special_tool_information(vehicle):
# where vehicle="{vehicle}";''', as_dict=1) # where vehicle="{vehicle}";''', as_dict=1)
special_tool_information = frappe.db.sql(''' select name,vehicle,tool_type,category,tool_name,aggregate_name,aggregate_image, special_tool_information = frappe.db.sql(''' select name,vehicle,tool_type,category,tool_name,aggregate_name,aggregate_image,
pdf,keywords,display_order,my_id,active_status from `tabSpecial Tool Information` pdf,image,keywords,display_order,my_id,active_status from `tabSpecial Tool Information`
where vehicle= '%s' ;''' % (vehicle), as_dict=1) where vehicle= '%s' ;''' % (vehicle), as_dict=1)
for s in special_tool_information: for s in special_tool_information:
# s['tool_usage_content'] = frappe.db.sql(f'''select idx as 'display_order',image,content,video,asset_type,active_status # s['tool_usage_content'] = frappe.db.sql(f'''select idx as 'display_order',image,content,video,asset_type,active_status

30
smart_service/phase_2/doctype/special_tool_information/special_tool_information.json

@ -10,11 +10,10 @@
"published", "published",
"column_break_cyo0a", "column_break_cyo0a",
"vehicle", "vehicle",
"column_break_nkf5o",
"active_status", "active_status",
"display_order", "display_order",
"column_break_m3p9i",
"category", "category",
"section_break_wwf2i",
"aggregate_name", "aggregate_name",
"aggregate_image", "aggregate_image",
"column_break_whk88", "column_break_whk88",
@ -24,6 +23,7 @@
"teb_instructions", "teb_instructions",
"keywords", "keywords",
"pdf", "pdf",
"image",
"tool_name", "tool_name",
"tool_type" "tool_type"
], ],
@ -62,10 +62,6 @@
"fieldname": "column_break_cyo0a", "fieldname": "column_break_cyo0a",
"fieldtype": "Section Break" "fieldtype": "Section Break"
}, },
{
"fieldname": "column_break_nkf5o",
"fieldtype": "Column Break"
},
{ {
"fieldname": "section_break_e91wx", "fieldname": "section_break_e91wx",
"fieldtype": "Section Break" "fieldtype": "Section Break"
@ -93,7 +89,8 @@
{ {
"fieldname": "aggregate_name", "fieldname": "aggregate_name",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Aggregate Name" "label": "Aggregate Name",
"reqd": 1
}, },
{ {
"fieldname": "category", "fieldname": "category",
@ -110,11 +107,6 @@
"label": "Aggregate Image" "label": "Aggregate Image"
}, },
{ {
"fieldname": "section_break_wwf2i",
"fieldtype": "Section Break"
},
{
"depends_on": "eval:doc.category=='TEB'",
"fieldname": "pdf", "fieldname": "pdf",
"fieldtype": "Attach", "fieldtype": "Attach",
"label": "PDF" "label": "PDF"
@ -128,7 +120,8 @@
{ {
"fieldname": "tool_name", "fieldname": "tool_name",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Tool Name" "label": "Tool Name",
"reqd": 1
}, },
{ {
"fieldname": "tool_type", "fieldname": "tool_type",
@ -142,11 +135,20 @@
"hidden": 1, "hidden": 1,
"label": "TEB Instructions", "label": "TEB Instructions",
"options": "TEB Instructions" "options": "TEB Instructions"
},
{
"fieldname": "image",
"fieldtype": "Attach Image",
"label": "Image"
},
{
"fieldname": "column_break_m3p9i",
"fieldtype": "Column Break"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2023-09-25 15:25:48.461308", "modified": "2023-09-27 11:59:38.479380",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Phase-2", "module": "Phase-2",
"name": "Special Tool Information", "name": "Special Tool Information",

2
smart_service/transactions/doctype/publish/publish.js

@ -269,7 +269,7 @@ frappe.ui.form.on("Publish", {
if (frm.doc.publish_module == "Automotive System") { if (frm.doc.publish_module == "Automotive System") {
//Jeci comment //Jeci comment
// cur_frm.set_df_property("system_mapping", "read_only", 1); cur_frm.set_df_property("system_mapping", "read_only", 1);
cur_frm.fields_dict["system_mapping"].grid.wrapper cur_frm.fields_dict["system_mapping"].grid.wrapper
.find(".grid-add-row") .find(".grid-add-row")
.hide(); .hide();

Loading…
Cancel
Save