Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: table cleanups, updated summary block

Browse Source
This commit is contained in:
Gavin D'souza 2020-04-29 04:01:24 +05:30
parent 27b7172fa4
commit 0d61b35b0b
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js
View File

@ -88,32 +88,38 @@ frappe.ui.form.on("Tally Migration", {
return return
} }
let rows = get_html_rows(shown_logs, field); let rows = get_html_rows(shown_logs, field);
let rows_head; let rows_head, table_caption;
let table_footer = (hidden_logs && (hidden_logs.length > 0)) ? `<tr class="text-muted">
<td colspan="4">And ${hidden_logs.length} more others</td>
</tr>`: "";
if (field === "fixed_error_log_preview") { if (field === "fixed_error_log_preview") {
rows_head = `<th width="75%">${__("Meta Data")}</th> rows_head = `<th width="75%">${__("Meta Data")}</th>
<th width="10%">${__("Unresolve")}</th>` <th width="10%">${__("Unresolve")}</th>`
table_caption = "Resolved Issues"
} else { } else {
rows_head = `<th width="75%">${__("Error Message")}</th> rows_head = `<th width="75%">${__("Error Message")}</th>
<th width="10%">${__("Create")}</th>` <th width="10%">${__("Create")}</th>`
table_caption = "Error Log"
} }
frm.get_field(field).$wrapper.html(` frm.get_field(field).$wrapper.html(`
<table class="table table-bordered"> <table class="table table-bordered">
<caption>${table_caption}</caption>
<tr class="text-muted"> <tr class="text-muted">
<th width="5%">${__("#")}</th> <th width="5%">${__("#")}</th>
<th width="10%">${__("DocType")}</th> <th width="10%">${__("DocType")}</th>
${rows_head} ${rows_head}
</tr> </tr>
${rows} ${rows}
<tr class="text-muted"> ${table_footer}
<td colspan="4">And ${hidden_logs.length} more others</td>
</tr>
</table> </table>
`); `);
}, },
show_error_summary() { show_error_summary(frm) {
let summary = import_log.reduce((summary, row) => { let summary = JSON.parse(frm.doc.failed_import_log).reduce((summary, row) => {
if (row.doc) { if (row.doc) {
if (summary[row.doc.doctype]) { if (summary[row.doc.doctype]) {
summary[row.doc.doctype] += 1; summary[row.doc.doctype] += 1;
@ -280,7 +286,6 @@ const get_html_rows = (logs, field) => {
</td> </td>
<td> <td>
<div>${error_message}</div> <div>${error_message}</div>
<div>${show_traceback}</div>
<div>${show_doc}</div> <div>${show_doc}</div>
</td> </td>
<td> <td>
@ -302,8 +307,8 @@ const get_html_rows = (logs, field) => {
<div>${create_button}</div> <div>${create_button}</div>
</td> </td>
</tr>`; </tr>`;
} }
}).join(""); }).join("");
return rows return rows
} }