From ec7fc7f3450280f747c8f786afc904e16a33d792 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 26 Apr 2020 12:37:40 +0530 Subject: [PATCH] fix: code formatting --- .../desk/doctype/number_card/number_card.js | 2 +- .../public/js/frappe/utils/dashboard_utils.js | 11 ++-- .../frappe/views/dashboard/dashboard_view.js | 11 ++-- .../public/js/frappe/widgets/base_widget.js | 3 +- .../js/frappe/widgets/number_card_widget.js | 51 ++++++++++--------- frappe/public/js/frappe/widgets/utils.js | 4 +- 6 files changed, 45 insertions(+), 37 deletions(-) diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js index a4823e2692..812582ae05 100644 --- a/frappe/desk/doctype/number_card/number_card.js +++ b/frappe/desk/doctype/number_card/number_card.js @@ -14,7 +14,7 @@ frappe.ui.form.on('Number Card', { filters: { 'issingle': false } - } + }; }); frm.set_value('filters_json', '[]'); frm.set_value('aggregate_function_based_on', ''); diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js index 16f54a1f84..a1628be34a 100644 --- a/frappe/public/js/frappe/utils/dashboard_utils.js +++ b/frappe/public/js/frappe/utils/dashboard_utils.js @@ -57,9 +57,10 @@ frappe.dashboard_utils = { }, get_dashboard_settings() { - return frappe.db.get_list('Dashboard Settings', - { - filters: {name: frappe.session.user}, + return frappe.db.get_list('Dashboard Settings', { + filters: { + name: frappe.session.user + }, fields: ['*'] }).then(settings => { if (!settings.length) { @@ -75,7 +76,9 @@ frappe.dashboard_utils = { create_dashboard_settings() { return frappe.xcall( 'frappe.desk.doctype.dashboard_settings.dashboard_settings.create_dashboard_settings', - {user: frappe.session.user} + { + user: frappe.session.user + } ).then(settings => { return settings; }); diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index f545fd7bd3..a3fe931f49 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -96,7 +96,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { }); this.render_dashboard_charts(); }); - this.render_number_cards(); if (!this.charts.length && !this.number_cards.length) { @@ -173,7 +172,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { `; this.$dashboard_wrapper.append(empty_state_html); - this.$empty_state = this.$dashboard_wrapper.find('.empty-dashboard'); } @@ -182,7 +180,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { return; } - if (this.$empty_state) { this.$empty_state.remove(); } @@ -228,7 +225,8 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.dashboard_settings = null; frappe.model.user_settings.save( this.doctype, 'dashboard_settings', this.dashboard_settings - ).then(()=> this.make_dashboard()); + ).then(() => this.make_dashboard()); + this.toggle_customize(false); } @@ -435,16 +433,17 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { group_by_fields.push({label: df.label, value: df.fieldname}); } }); + return { date_fields: date_fields, value_fields: value_fields, group_by_fields: group_by_fields, aggregate_function_fields: aggregate_function_fields - } + }; } remove_duplicates(items) { return items.filter((item, index) => items.indexOf(item) === index); } -} +}; diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 7b3770ec9e..e2df42472a 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -113,7 +113,8 @@ export default class Widget { let remove_widget = () => { this.widget.remove(); this.options.on_delete && this.options.on_delete(this.name); - } + }; + if (animate) { this.widget.addClass("zoomOutDelete"); // wait for animation diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index ed124ef656..9eb985ca82 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -19,7 +19,7 @@ export default class NumberCardWidget extends Widget { this.set_body(); } - set_body() { + set_body() { this.widget.addClass("number-widget-box"); this.make_card(); } @@ -29,7 +29,7 @@ export default class NumberCardWidget extends Widget { } make_card() { - frappe.model.with_doc("Number Card", this.name).then(card => { + frappe.model.with_doc('Number Card', this.name).then(card => { if (!card) { if (this.document_type) { this.create_number_card(); @@ -52,7 +52,9 @@ export default class NumberCardWidget extends Widget { this.set_doc_args(); frappe.xcall( 'frappe.desk.doctype.number_card.number_card.create_number_card', - {'args': this.card_doc} + { + 'args': this.card_doc + } ).then(doc => { this.name = doc.name; this.widget.attr('data-widget-name', this.name); @@ -96,7 +98,9 @@ export default class NumberCardWidget extends Widget { } get_number() { - return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_result', {doc: this.card_doc}).then(res => { + return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_result', { + doc: this.card_doc + }).then(res => { this.number = res; if (this.card_doc.function !== 'Count') { return frappe.model.with_doctype(this.card_doc.document_type, () => { @@ -148,43 +152,43 @@ export default class NumberCardWidget extends Widget { $(this.body).find('.widget-content').append(`
${caret_html} ${Math.abs(this.percentage_stat)} % -
`) + `); }); } get_percentage_stats() { - return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_percentage_difference', - { - doc: this.card_doc, - result: this.number - }).then(res => { - if (res !== undefined) { - this.percentage_stat = +res.toFixed(2); - } + return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_percentage_difference', { + doc: this.card_doc, + result: this.number + }).then(res => { + if (res !== undefined) { + this.percentage_stat = +res.toFixed(2); + } }); } prepare_actions() { let actions = [ { - label: __("Refresh"), - action: "action-refresh", + label: __('Refresh'), + action: 'action-refresh', handler: () => { this.render_card(); } }, { - label: __("Edit"), - action: "action-edit", + label: __('Edit'), + action: 'action-edit', handler: () => { frappe.set_route( - "Form", - "Number Card", + 'Form', + 'Number Card', this.name ); } }, ]; + this.set_card_actions(actions); } @@ -196,11 +200,11 @@ export default class NumberCardWidget extends Widget { `); @@ -209,6 +213,7 @@ export default class NumberCardWidget extends Widget { const action = o.dataset.action; $(o).click(actions.find(a => a.action === action)); }); + this.action_area.html(this.card_actions); } } diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index a3f6726264..039ede305a 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -124,9 +124,9 @@ function go_to_list_with_filters(doctype, filters) { } function shorten_number(number) { - let x = Math.abs(Math.round(number)) + let x = Math.abs(Math.round(number)); - switch(true) { + switch (true) { case x >= 1.0e+12: return Math.round(number/1.0e+12) + " T"; case x >= 1.0e+9: