Browse Source

Torque mapping colum HTML update

version2
venkata akhil 9 months ago
parent
commit
68aab0d9a7
  1. 13
      smart_service/phase_2/doctype/torque_column_ref/torque_column_ref.json
  2. 77
      smart_service/phase_2/doctype/torque_manual/torque_manual.js
  3. 20
      smart_service/phase_2/doctype/torque_manual/torque_manual.json
  4. 9
      smart_service/phase_2/doctype/torque_manual/torque_manual.py
  5. 16
      smart_service/phase_2/doctype/torque_manual_mapping/torque_manual_mapping.json

13
smart_service/phase_2/doctype/torque_column_ref/torque_column_ref.json

@ -6,26 +6,27 @@
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"column", "column_id",
"column_name" "column_name"
], ],
"fields": [ "fields": [
{ {
"fieldname": "column", "fieldname": "column_name",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Column Number" "in_list_view": 1,
"label": "Column Name"
}, },
{ {
"fieldname": "column_name", "fieldname": "column_id",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 1,
"label": "Column Name" "label": "Column Id"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2023-12-12 12:02:49.911584", "modified": "2023-12-15 16:25:14.032041",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Phase-2", "module": "Phase-2",
"name": "Torque Column Ref", "name": "Torque Column Ref",

77
smart_service/phase_2/doctype/torque_manual/torque_manual.js

@ -2,12 +2,32 @@
// For license information, please see license.txt // For license information, please see license.txt
var original_display_order = 0; var original_display_order = 0;
var vehicle_count = 0; var vehicle_count = 0;
frappe.require('assets/smart_service/js/boostrap_table.js', () => {
})
frappe.require('assets/smart_service/css/boostrap_table.css', () => {
})
frappe.ui.form.on('Torque Manual', { frappe.ui.form.on('Torque Manual', {
refresh: function(frm) { refresh: function(frm) {
set_display_order(frm) set_display_order(frm)
}, },
onload:function(frm){
if (frm.doc.vehicle){
get_column_data(frm)
}
},
vehicle:function(frm){
if (frm.doc.vehicle){
get_column_data(frm)
}
}
}); });
function set_display_order(frm){ function set_display_order(frm){
@ -32,3 +52,60 @@ function set_display_order(frm){
} }
}); });
} }
function get_column_data(frm){
frappe.call({
method: "smart_service.phase_2.doctype.torque_manual.torque_manual.get_column_details",
args: {vehicle: frm.doc.vehicle}
}).done((r) => {
let details = []
if(r.message.success == 1){
$.each(r.message.data, function(_i, e){
debugger
details.push({"columnid":e.column_id,"column_name":e.column_name});
debugger
})
console.log(details)
var res = $(cur_frm.fields_dict.column_details.wrapper).empty();
var html = ""
html = '<div class="table-responsive"><table id="tblEmployee" class="table table-striped"></table></div>'
$(res).append(html)
$('#tblEmployee').bootstrapTable({
data: details,
// height: 500,
pagination: false,
pageSize: 10,
// pageList: [],
search: false,
showExport: false,
exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'pdf'],
columns: [{
field: 'columnid',
title: 'Column Number',
align: 'center',
valign: 'bottom',
sortable: false,
width: '10%'
},
{
field: 'column_name',
title: 'Column Name',
align: 'left',
valign: 'bottom',
sortable: false,
width: '10%'
}]
})
}
})
}

20
smart_service/phase_2/doctype/torque_manual/torque_manual.json

@ -19,7 +19,8 @@
"display_order", "display_order",
"keywords", "keywords",
"section_break_cmyhs", "section_break_cmyhs",
"torque_coulmn_name", "column_details",
"section_break_s6fxa",
"torque_table" "torque_table"
], ],
"fields": [ "fields": [
@ -27,7 +28,8 @@
"default": "0", "default": "0",
"fieldname": "is_published", "fieldname": "is_published",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Published" "label": "Published",
"read_only": 1
}, },
{ {
"fieldname": "section_break_qg2b0", "fieldname": "section_break_qg2b0",
@ -114,15 +116,19 @@
"options": "Torque Manual Details" "options": "Torque Manual Details"
}, },
{ {
"fieldname": "torque_coulmn_name", "fieldname": "column_details",
"fieldtype": "Table", "fieldtype": "HTML",
"label": "Torque Coulmn Name", "label": "Column Details",
"options": "Torque Column Ref" "read_only": 1
},
{
"fieldname": "section_break_s6fxa",
"fieldtype": "Section Break"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2023-12-12 12:03:24.953779", "modified": "2023-12-15 18:31:16.172009",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Phase-2", "module": "Phase-2",
"name": "Torque Manual", "name": "Torque Manual",

9
smart_service/phase_2/doctype/torque_manual/torque_manual.py

@ -45,6 +45,15 @@ class TorqueManual(Document):
raise e raise e
@frappe.whitelist(allow_guest = 1)
def get_column_details(vehicle=None):
try:
torque_column_mapping = frappe.db.sql(f''' select idx as display_order, concat('col',idx) as column_id,column_name from `tabTorque Column Mapping` where parent = '{vehicle}' order by idx; ''', as_dict=1)
return {"success":1,"data":torque_column_mapping}
except Exception as e:
return {"success":0,"data":None,msg:str(e)}
# @frappe.whitelist() # @frappe.whitelist()
# def file_validation_child(name=None, value=None): # def file_validation_child(name=None, value=None):

16
smart_service/phase_2/doctype/torque_manual_mapping/torque_manual_mapping.json

@ -1,32 +1,24 @@
{ {
"actions": [], "actions": [],
"allow_rename": 1, "allow_rename": 1,
"autoname": "format:{variant}", "autoname": "format:{vehicle}",
"creation": "2023-12-12 14:44:55.388191", "creation": "2023-12-12 14:44:55.388191",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"variant",
"vehicle", "vehicle",
"section_break_bytf4", "section_break_bytf4",
"torque_table_columns" "torque_table_columns"
], ],
"fields": [ "fields": [
{
"fieldname": "variant",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Variant",
"options": "Variant Mapping",
"reqd": 1
},
{ {
"fetch_from": "variant.vehicle", "fetch_from": "variant.vehicle",
"fieldname": "vehicle", "fieldname": "vehicle",
"fieldtype": "Data", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Vehicle", "label": "Vehicle",
"options": "Vehicle",
"reqd": 1 "reqd": 1
}, },
{ {
@ -42,7 +34,7 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2023-12-12 15:05:37.251699", "modified": "2023-12-15 16:17:58.889238",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Phase-2", "module": "Phase-2",
"name": "Torque Manual Mapping", "name": "Torque Manual Mapping",

Loading…
Cancel
Save