Merge pull request #12006 from rtdany10/patch-1

frappe/desk/doctype/number_card/number_card.py

@@ -86,7 +86,7 @@ def get_result(doc, filters, to_date=None):
 	filters = frappe.parse_json(filters)
 
 	if not filters:
-			filters = []
+		filters = []
 
 	if to_date:
 		filters.append([doc.document_type, 'creation', '<', to_date])
@@ -107,9 +107,13 @@ def get_percentage_difference(doc, filters, result):
 		return
 
 	previous_result = calculate_previous_result(doc, filters)
-	difference = (result - previous_result)/100.0
-
-	return difference
+	if previous_result == 0:
+		return None
+	else:
+		if result == previous_result:
+			return 0
+		else:
+			return ((result/previous_result)-1)*100.0
 
 
 def calculate_previous_result(doc, filters):
@@ -197,4 +201,4 @@ def add_card_to_dashboard(args):
 		card.save()
 
 	dashboard.append('cards', dashboard_link)
-	dashboard.save()
+	dashboard.save()

frappe/public/js/frappe/widgets/number_card_widget.js

@@ -231,9 +231,7 @@ export default class NumberCardWidget extends Widget {
 		let color_class = '';
 
 		return this.get_percentage_stats().then(() => {
-			if (this.percentage_stat == undefined) return;
-
-			if (this.percentage_stat == 0) {
+			if (this.percentage_stat == 0 || this.percentage_stat == undefined) {
 				color_class = 'grey-stat';
 			} else if (this.percentage_stat > 0) {
 				caret_html =
@@ -258,6 +256,7 @@ export default class NumberCardWidget extends Widget {
 			const stats_qualifier = stats_qualifier_map[this.card_doc.stats_time_interval];
 
 			let get_stat = () => {
+				if (this.percentage_stat == undefined) return NaN;
 				const parts = this.percentage_stat.split(' ');
 				const symbol = parts[1] || '';
 				return Math.abs(parts[0]) + ' ' + symbol;