diff --git a/www/plugins/graph/i18n/locale-en-GB.json b/www/plugins/graph/i18n/locale-en-GB.json
index ab129a8e3721bae641b488e2bb4e64c0c4f13fb4..d972514c8080e7603fe3884326ace68294ed5346 100644
--- a/www/plugins/graph/i18n/locale-en-GB.json
+++ b/www/plugins/graph/i18n/locale-en-GB.json
@@ -59,12 +59,17 @@
}
},
"DOC_STATS": {
- "TITLE": "Data storage statistics",
+ "TITLE": "Data storage statistics (Cesium+)",
"USER": {
"TITLE": "Number of documents linked to an account",
"USER_PROFILE": "User profiles",
"USER_SETTINGS": "Saved settings"
},
+ "USER_DELTA": {
+ "TITLE": "Delta / Number of documents linked to an account",
+ "USER_PROFILE": "User profiles",
+ "USER_SETTINGS": "Saved settings"
+ },
"MESSAGE": {
"TITLE": "Number of documents related to the communication",
"MESSAGE_INBOX": "Messages in inbox",
diff --git a/www/plugins/graph/i18n/locale-en.json b/www/plugins/graph/i18n/locale-en.json
index ab129a8e3721bae641b488e2bb4e64c0c4f13fb4..d972514c8080e7603fe3884326ace68294ed5346 100644
--- a/www/plugins/graph/i18n/locale-en.json
+++ b/www/plugins/graph/i18n/locale-en.json
@@ -59,12 +59,17 @@
}
},
"DOC_STATS": {
- "TITLE": "Data storage statistics",
+ "TITLE": "Data storage statistics (Cesium+)",
"USER": {
"TITLE": "Number of documents linked to an account",
"USER_PROFILE": "User profiles",
"USER_SETTINGS": "Saved settings"
},
+ "USER_DELTA": {
+ "TITLE": "Delta / Number of documents linked to an account",
+ "USER_PROFILE": "User profiles",
+ "USER_SETTINGS": "Saved settings"
+ },
"MESSAGE": {
"TITLE": "Number of documents related to the communication",
"MESSAGE_INBOX": "Messages in inbox",
diff --git a/www/plugins/graph/i18n/locale-fr-FR.json b/www/plugins/graph/i18n/locale-fr-FR.json
index 991f8966972adf77819d39547a260adcc965e01c..83edacad00d19a1a4053b56d329e4b28d54aeb44 100644
--- a/www/plugins/graph/i18n/locale-fr-FR.json
+++ b/www/plugins/graph/i18n/locale-fr-FR.json
@@ -68,12 +68,17 @@
}
},
"DOC_STATS": {
- "TITLE": "Statistiques de stockage",
+ "TITLE": "Statistiques de stockage (Cesium+)",
"USER": {
"TITLE": "Nombre de documents liés à un compte",
"USER_PROFILE": "Profils utilisateur",
"USER_SETTINGS": "Paramètres sauvegardés"
},
+ "USER_DELTA": {
+ "TITLE": "Variation du nombre de documents liés à un compte",
+ "USER_PROFILE": "Profils utilisateur",
+ "USER_SETTINGS": "Paramètres sauvegardés"
+ },
"MESSAGE": {
"TITLE": "Nombre de documents liés à la communication",
"MESSAGE_INBOX": "Messages en boîte de réception",
diff --git a/www/plugins/graph/js/controllers/docstats-controllers.js b/www/plugins/graph/js/controllers/docstats-controllers.js
index c2dd913634ba99a0ad27cf00b366deac5eb0d313..2052e4b3734686ee9a9ba608a283bf1da12afbcc 100644
--- a/www/plugins/graph/js/controllers/docstats-controllers.js
+++ b/www/plugins/graph/js/controllers/docstats-controllers.js
@@ -31,6 +31,7 @@ function GpDocStatsController($scope, $state, $controller, $q, $translate, gpCol
// Initialize the super class and extend it.
angular.extend(this, $controller('GpCurrencyAbstractCtrl', {$scope: $scope}));
+ $scope.displayRightAxis = true;
$scope.hiddenDatasets = [];
$scope.chartIdPrefix = 'docstats-chart-';
@@ -44,7 +45,7 @@ function GpDocStatsController($scope, $state, $controller, $q, $translate, gpCol
{
key: 'user_profile',
label: 'GRAPH.DOC_STATS.USER.USER_PROFILE',
- color: gpColor.rgba.royal(),
+ color: gpColor.rgba.royal(0.7),
pointHoverBackgroundColor: gpColor.rgba.royal(),
clickState: {
name: 'app.document_search',
@@ -64,6 +65,30 @@ function GpDocStatsController($scope, $state, $controller, $q, $translate, gpCol
]
},
+ // User delta
+ {
+ id: 'user_delta',
+ title: 'GRAPH.DOC_STATS.USER_DELTA.TITLE',
+ series: [
+ {
+ key: 'user_profile_delta',
+ label: 'GRAPH.DOC_STATS.USER_DELTA.USER_PROFILE',
+ type: 'line',
+ yAxisID: 'y-axis-delta',
+ color: gpColor.rgba.royal(),
+ pointHoverBackgroundColor: gpColor.rgba.royal()
+ },
+ {
+ key: 'user_settings_delta',
+ label: 'GRAPH.DOC_STATS.USER_DELTA.USER_SETTINGS',
+ type: 'line',
+ yAxisID: 'y-axis-delta',
+ color: gpColor.rgba.gray(0.5),
+ pointHoverBackgroundColor: gpColor.rgba.gray()
+ }
+ ]
+ },
+
// Message & Co.
{
id: 'message',
@@ -177,8 +202,21 @@ function GpDocStatsController($scope, $state, $controller, $q, $translate, gpCol
}],
yAxes: [
{
- stacked: true,
- id: 'y-axis'
+ id: 'y-axis',
+ stacked: true
+ },
+ {
+ id: 'y-axis-delta',
+ stacked: false
+ },
+ {
+ id: 'y-axis-delta-right',
+ stacked: false,
+ display: $scope.displayRightAxis,
+ position: 'right',
+ gridLines: {
+ drawOnChartArea: false
+ }
}
]
},
@@ -231,9 +269,9 @@ function GpDocStatsController($scope, $state, $controller, $q, $translate, gpCol
// Labels
var labelPattern = datePatterns[$scope.formData.rangeDuration];
- $scope.labels = result.times.reduce(function(res, time) {
- return res.concat(moment.unix(time).local().format(labelPattern));
- }, []);
+ $scope.labels = _.map(result.times, function(time) {
+ return moment.unix(time).local().format(labelPattern);
+ });
// Update range options with received values
$scope.updateRange(result.times[0], result.times[result.times.length-1], updateTimePct);
@@ -243,25 +281,36 @@ function GpDocStatsController($scope, $state, $controller, $q, $translate, gpCol
// For each chart
_.forEach($scope.charts, function(chart){
- // Data
- chart.data = [];
- _.forEach(chart.series, function(serie){
- chart.data.push(result[serie.key]||[]);
+ // Prepare chart data
+ var usedYAxisIDs = {};
+ chart.data = _.map(chart.series, function(serie) {
+ usedYAxisIDs[serie.yAxisID||'y-axis'] = true;
+ // If 'delta' serie, then compute delta from the source serie
+ if (serie.key.endsWith('_delta')) {
+ var key = serie.key.substring(0, serie.key.length - '_delta'.length);
+ return getDeltaFromValueArray(result[key]) || [];
+ }
+ return result[serie.key]||[];
});
// Options (with title)
chart.options = angular.copy($scope.defaultChartOptions);
chart.options.title.text = translations[chart.title];
+ // Remove unused yAxis
+ chart.options.scales.yAxes = chart.options.scales.yAxes.reduce(function(res, yAxe){
+ return usedYAxisIDs[yAxe.id] ? res.concat(yAxe) : res;
+ }, []);
+
// Series datasets
- chart.datasetOverride = chart.series.reduce(function(res, serie) {
- return res.concat({
- yAxisID: 'y-axis',
+ chart.datasetOverride = _.map(chart.series, function(serie) {
+ return {
+ yAxisID: serie.yAxisID ||Â 'y-axis',
type: serie.type || 'line',
label: translations[serie.label],
- fill: true,
+ fill: serie.type !== 'line',
borderWidth: 2,
- pointRadius: 0,
+ pointRadius: serie.type !== 'line' ? 0 : 2,
pointHitRadius: 4,
pointHoverRadius: 3,
borderColor: serie.color,
@@ -270,8 +319,8 @@ function GpDocStatsController($scope, $state, $controller, $q, $translate, gpCol
pointBorderColor: serie.color,
pointHoverBackgroundColor: serie.pointHoverBackgroundColor||serie.color,
pointHoverBorderColor: serie.pointHoverBorderColor||gpColor.rgba.white()
- });
- }, []);
+ };
+ });
});
});
@@ -300,5 +349,14 @@ function GpDocStatsController($scope, $state, $controller, $q, $translate, gpCol
}
};
+ function getDeltaFromValueArray(values) {
+ if (!values) return undefined;
+ var previousValue;
+ return _.map(values, function(value) {
+ var newValue = (value !== undefined) && (value - (previousValue || value)) ||Â undefined;
+ previousValue = value;
+ return newValue;
+ });
+ }
}