Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/survey_server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-10-18 15:18:16 +0300
committerJoas Schilling <coding@schilljs.com>2016-10-18 15:18:16 +0300
commit64ec46a6e7c53cea8b2b996c850a7f1531f7f85d (patch)
tree9626ae25c903a867d0eb0ca504e73c6b089e8e17
parent6314138a6da38d415315d281cad3231133c9265f (diff)
Better format for huge numbers
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--js/script.js25
1 files changed, 15 insertions, 10 deletions
diff --git a/js/script.js b/js/script.js
index 2b61961..2f994c7 100644
--- a/js/script.js
+++ b/js/script.js
@@ -35,19 +35,24 @@
return color;
};
+ var formatNumber = function(number) {
+ number = number.toString();
+ return number.replace(/(\d)(?=(\d{3})+(\.|$))/g, '$1,');
+ };
+
/**
* add general statistics to the page
* @param instances how many instances are counted
* @param users statistics about the users
*/
var showGeneralStatistics = function(instances, users, files) {
- $('#instances span').text(instances);
- $('#maxUsers span').text(users['max']);
- $('#minUsers span').text(users['min']);
- $('#averageUsers span').text(users['average']);
- $('#maxFiles span').text(files['max']);
- $('#minFiles span').text(files['min']);
- $('#averageFiles span').text(files['average']);
+ $('#instances span').text(formatNumber(instances));
+ $('#maxUsers span').text(formatNumber(users['max']));
+ $('#minUsers span').text(formatNumber(users['min']));
+ $('#averageUsers span').text(formatNumber(users['average']));
+ $('#maxFiles span').text(formatNumber(files['max']));
+ $('#minFiles span').text(formatNumber(files['min']));
+ $('#averageFiles span').text(formatNumber(files['average']));
};
@@ -62,9 +67,9 @@
$('#' + id + 'Min span').text(OC.Util.humanFileSize(data['min']));
$('#' + id + 'Average span').text(OC.Util.humanFileSize(data['average']));
} else {
- $('#' + id + 'Max span').text(data['max']);
- $('#' + id + 'Min span').text(data['min']);
- $('#' + id + 'Average span').text(data['average']);
+ $('#' + id + 'Max span').text(formatNumber(data['max']));
+ $('#' + id + 'Min span').text(formatNumber(data['min']));
+ $('#' + id + 'Average span').text(formatNumber(data['average']));
}
};