nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: add prettier to pre-commit (backport #40206) (#40362)

Browse Source 
* ci: add prettier to pre-commit

(cherry picked from commit 2c16036ef3)

* style: format js files

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
mergify[bot]
2024-03-11 10:47:18 +05:30
committed by GitHub
parent 5f789d9abe
commit 7d3d2eb928
572 changed files with 24271 additions and 21331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js
View File

@@ -1,12 +1,12 @@
frappe.pages['bom-comparison-tool'].on_page_load = function(wrapper) {
frappe.pages["bom-comparison-tool"].on_page_load = function (wrapper) {
var page = frappe.ui.make_app_page({
parent: wrapper,
title: __('BOM Comparison Tool'),
single_column: true
title: __("BOM Comparison Tool"),
single_column: true,
});
new erpnext.BOMComparisonTool(page);
}
};
erpnext.BOMComparisonTool = class BOMComparisonTool {
constructor(page) {
@@ -18,45 +18,45 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
this.form = new frappe.ui.FieldGroup({
fields: [
{
label: __('BOM 1'),
fieldname: 'name1',
fieldtype: 'Link',
options: 'BOM',
label: __("BOM 1"),
fieldname: "name1",
fieldtype: "Link",
options: "BOM",
change: () => this.fetch_and_render(),
get_query: () => {
return {
filters: {
"name": ["not in", [this.form.get_value("name2") || ""]]
}
}
}
name: ["not in", [this.form.get_value("name2") || ""]],
},
};
},
},
{
fieldtype: 'Column Break'
fieldtype: "Column Break",
},
{
label: __('BOM 2'),
fieldname: 'name2',
fieldtype: 'Link',
options: 'BOM',
label: __("BOM 2"),
fieldname: "name2",
fieldtype: "Link",
options: "BOM",
change: () => this.fetch_and_render(),
get_query: () => {
return {
filters: {
"name": ["not in", [this.form.get_value("name1") || ""]]
}
}
}
name: ["not in", [this.form.get_value("name1") || ""]],
},
};
},
},
{
fieldtype: 'Section Break'
fieldtype: "Section Break",
},
{
fieldtype: 'HTML',
fieldname: 'preview'
}
fieldtype: "HTML",
fieldname: "preview",
},
],
body: this.page.body
body: this.page.body,
});
this.form.make();
}
@@ -64,33 +64,34 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
fetch_and_render() {
let { name1, name2 } = this.form.get_values();
if (!(name1 && name2)) {
this.form.get_field('preview').html('');
this.form.get_field("preview").html("");
return;
}
// set working state
this.form.get_field('preview').html(`
this.form.get_field("preview").html(`
<div class="text-muted margin-top">
${__("Fetching...")}
</div>
`);
frappe.call('erpnext.manufacturing.doctype.bom.bom.get_bom_diff', {
bom1: name1,
bom2: name2
}).then(r => {
let diff = r.message;
frappe.model.with_doctype('BOM', () => {
this.render('BOM', name1, name2, diff);
frappe
.call("erpnext.manufacturing.doctype.bom.bom.get_bom_diff", {
bom1: name1,
bom2: name2,
})
.then((r) => {
let diff = r.message;
frappe.model.with_doctype("BOM", () => {
this.render("BOM", name1, name2, diff);
});
});
});
}
render(doctype, name1, name2, diff) {
let change_html = (title, doctype, changed) => {
let values_changed = this.get_changed_values(doctype, changed)
.map(change => {
.map((change) => {
let [fieldname, value1, value2] = change;
return `
<tr>
@@ -100,14 +101,14 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
</tr>
`;
})
.join('');
.join("");
return `
<h4 class="margin-top">${title}</h4>
<div>
<table class="table table-bordered">
<tr>
<th width="33%">${__('Field')}</th>
<th width="33%">${__("Field")}</th>
<th width="33%">${name1}</th>
<th width="33%">${name2}</th>
</tr>
@@ -115,28 +116,30 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
</table>
</div>
`;
}
};
let value_changes = change_html(__('Values Changed'), doctype, diff.changed);
let value_changes = change_html(__("Values Changed"), doctype, diff.changed);
let row_changes_by_fieldname = group_items(diff.row_changed, change => change[0]);
let row_changes_by_fieldname = group_items(diff.row_changed, (change) => change[0]);
let table_changes = Object.keys(row_changes_by_fieldname).map(fieldname => {
let changes = row_changes_by_fieldname[fieldname];
let df = frappe.meta.get_docfield(doctype, fieldname);
let html = changes.map(change => {
let [fieldname,, item_code, changes] = change;
let table_changes = Object.keys(row_changes_by_fieldname)
.map((fieldname) => {
let changes = row_changes_by_fieldname[fieldname];
let df = frappe.meta.get_docfield(doctype, fieldname);
let child_doctype = df.options;
let values_changed = this.get_changed_values(child_doctype, changes);
return values_changed.map((change, i) => {
let [fieldname, value1, value2] = change;
let th = i === 0
? `<th rowspan="${values_changed.length}">${item_code}</th>`
: '';
return `
let html = changes
.map((change) => {
let [fieldname, , item_code, changes] = change;
let df = frappe.meta.get_docfield(doctype, fieldname);
let child_doctype = df.options;
let values_changed = this.get_changed_values(child_doctype, changes);
return values_changed
.map((change, i) => {
let [fieldname, value1, value2] = change;
let th =
i === 0 ? `<th rowspan="${values_changed.length}">${item_code}</th>` : "";
return `
<tr>
${th}
<td>${frappe.meta.get_label(child_doctype, fieldname)}</td>
@@ -144,54 +147,58 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
<td>${value2}</td>
</tr>
`;
}).join('');
}).join('');
})
.join("");
})
.join("");
return `
<h4 class="margin-top">${__('Changes in {0}', [df.label])}</h4>
return `
<h4 class="margin-top">${__("Changes in {0}", [df.label])}</h4>
<table class="table table-bordered">
<tr>
<th width="25%">${__('Item Code')}</th>
<th width="25%">${__('Field')}</th>
<th width="25%">${__("Item Code")}</th>
<th width="25%">${__("Field")}</th>
<th width="25%">${name1}</th>
<th width="25%">${name2}</th>
</tr>
${html}
</table>
`;
}).join('');
})
.join("");
let get_added_removed_html = (title, grouped_items) => {
return Object.keys(grouped_items).map(fieldname => {
let rows = grouped_items[fieldname];
let df = frappe.meta.get_docfield(doctype, fieldname);
let fields = frappe.meta.get_docfields(df.options)
.filter(df => df.in_list_view);
return Object.keys(grouped_items)
.map((fieldname) => {
let rows = grouped_items[fieldname];
let df = frappe.meta.get_docfield(doctype, fieldname);
let fields = frappe.meta.get_docfields(df.options).filter((df) => df.in_list_view);
let html = rows.map(row => {
let [, doc] = row;
let cells = fields
.map(df => `<td>${doc[df.fieldname]}</td>`)
.join('');
return `<tr>${cells}</tr>`;
}).join('');
let html = rows
.map((row) => {
let [, doc] = row;
let cells = fields.map((df) => `<td>${doc[df.fieldname]}</td>`).join("");
return `<tr>${cells}</tr>`;
})
.join("");
let header = fields.map(df => `<th>${df.label}</th>`).join('');
return `
let header = fields.map((df) => `<th>${df.label}</th>`).join("");
return `
<h4 class="margin-top">${$.format(title, [df.label])}</h4>
<table class="table table-bordered">
<tr>${header}</tr>
${html}
</table>
`;
}).join('');
})
.join("");
};
let added_by_fieldname = group_items(diff.added, change => change[0]);
let removed_by_fieldname = group_items(diff.removed, change => change[0]);
let added_by_fieldname = group_items(diff.added, (change) => change[0]);
let removed_by_fieldname = group_items(diff.removed, (change) => change[0]);
let added_html = get_added_removed_html(__('Rows Added in {0}'), added_by_fieldname);
let removed_html = get_added_removed_html(__('Rows Removed in {0}'), removed_by_fieldname);
let added_html = get_added_removed_html(__("Rows Added in {0}"), added_by_fieldname);
let removed_html = get_added_removed_html(__("Rows Removed in {0}"), removed_by_fieldname);
let html = `
${value_changes}
@@ -200,14 +207,14 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
${removed_html}
`;
this.form.get_field('preview').html(html);
this.form.get_field("preview").html(html);
}
get_changed_values(doctype, changed) {
return changed.filter(change => {
return changed.filter((change) => {
let [fieldname, value1, value2] = change;
if (!value1) value1 = '';
if (!value2) value2 = '';
if (!value1) value1 = "";
if (!value2) value2 = "";
if (value1 === value2) return false;
let df = frappe.meta.get_docfield(doctype, fieldname);
if (!df) return false;

13
erpnext/manufacturing/page/visual_plant_floor/visual_plant_floor.js
View File

@@ -1,13 +1,12 @@
frappe.pages['visual-plant-floor'].on_page_load = function(wrapper) {
frappe.pages["visual-plant-floor"].on_page_load = function (wrapper) {
var page = frappe.ui.make_app_page({
parent: wrapper,
title: 'Visual Plant Floor',
single_column: true
title: "Visual Plant Floor",
single_column: true,
});
frappe.visual_plant_floor = new frappe.ui.VisualPlantFloor(
{wrapper: $(wrapper).find('.layout-main-section')}, wrapper.page
{ wrapper: $(wrapper).find(".layout-main-section") },
wrapper.page
);
}
};