diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 6320d31b8b..5b66451526 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -4652,7 +4652,7 @@ msgid "X_VERSUS_Y" msgstr "{x_axis_label} vs. {y_axis_label}" msgid "X_VERSUS_Y_AGGREGATED" -msgstr "{x_axis_label} vs. {y_axis_label} (Averaged)" +msgstr "{x_axis_label} vs. {y_axis_label} ({aggregationType})" msgid "Y Axis" msgstr "Y Axis" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 20437b9fd6..225f67ed03 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -6025,7 +6025,7 @@ msgstr "{x_axis_label} vs. {y_axis_label}" #, fuzzy msgid "X_VERSUS_Y_AGGREGATED" -msgstr "{x_axis_label} vs. {y_axis_label} (Agregado)" +msgstr "{x_axis_label} vs. {y_axis_label} ({aggregationType})" #, fuzzy msgid "Y Axis" diff --git a/locale/fr_CA/LC_MESSAGES/django.po b/locale/fr_CA/LC_MESSAGES/django.po index ea5a3a2277..5caf7e5987 100644 --- a/locale/fr_CA/LC_MESSAGES/django.po +++ b/locale/fr_CA/LC_MESSAGES/django.po @@ -4692,7 +4692,7 @@ msgstr "{x_axis_label} contre {y_axis_label}" #, fuzzy msgid "X_VERSUS_Y_AGGREGATED" -msgstr "{x_axis_label} contre {y_axis_label} (agrégé)" +msgstr "{x_axis_label} contre {y_axis_label} ({aggregationType})" msgid "Y Axis" msgstr "Axe Y" diff --git a/seed/static/seed/js/controllers/inventory_reports_controller.js b/seed/static/seed/js/controllers/inventory_reports_controller.js index d6de79fc32..c2f3dce43a 100644 --- a/seed/static/seed/js/controllers/inventory_reports_controller.js +++ b/seed/static/seed/js/controllers/inventory_reports_controller.js @@ -288,6 +288,7 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re const localStorageXAxisKey = `${base_storage_key}.xaxis`; const localStorageYAxisKey = `${base_storage_key}.yaxis`; + const localStorageAggregationTypeKey = `${base_storage_key}.aggregationType`; const localStorageALIndex = `${base_storage_key}.ALIndex`; const localStorageALIID = `${base_storage_key}.ALIID`; const localStorageReportConfigID = `${base_storage_key}.RCID`; @@ -300,6 +301,7 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re // Currently selected x and y variables - check local storage first, otherwise initialize to first choice $scope.yAxisSelectedItem = JSON.parse(localStorage.getItem(localStorageYAxisKey)) || $scope.yAxisVars[0]; $scope.xAxisSelectedItem = JSON.parse(localStorage.getItem(localStorageXAxisKey)) || $scope.xAxisVars[0]; + $scope.aggregationType = JSON.parse(localStorage.getItem(localStorageAggregationTypeKey)) || $scope.xAxisVars[0]; $scope.level_name_index = JSON.parse(localStorage.getItem(localStorageALIndex)) || '0'; const new_level_instance_depth = parseInt($scope.level_name_index, 10) + parseInt(users_depth, 10); @@ -547,13 +549,15 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re try { interpolationParams = { x_axis_label: $translate.instant($scope.xAxisSelectedItem.label), - y_axis_label: $translate.instant($scope.yAxisSelectedItem.label) + y_axis_label: $translate.instant($scope.yAxisSelectedItem.label), + aggregationType: $translate.instant( $scope.aggregationType) }; } catch (e) { $log.error('$sce issue... missing translation'); interpolationParams = { x_axis_label: $scope.xAxisSelectedItem.label, - y_axis_label: $scope.yAxisSelectedItem.label + y_axis_label: $scope.yAxisSelectedItem.label, + aggregationType: $scope.aggregationType }; } $scope.chart1Title = $translate.instant('X_VERSUS_Y', interpolationParams); @@ -707,7 +711,7 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re $scope.aggChartIsLoading = true; inventory_reports_service - .get_aggregated_report_data(xVar, yVar, $scope.selected_cycles, $scope.access_level_instance_id, $scope.filter_group_id) + .get_aggregated_report_data(xVar, yVar, $scope.selected_cycles, $scope.access_level_instance_id, $scope.filter_group_id, $scope.aggregationType) .then( (data) => { data = data.aggregated_data; @@ -763,6 +767,7 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re // Save axis and cycle selections localStorage.setItem(localStorageXAxisKey, JSON.stringify($scope.xAxisSelectedItem ?? '')); localStorage.setItem(localStorageYAxisKey, JSON.stringify($scope.yAxisSelectedItem ?? '')); + localStorage.setItem(localStorageAggregationTypeKey, JSON.stringify($scope.aggregationType ?? '')); localStorage.setItem(localStorageSelectedCycles, JSON.stringify($scope.selected_cycles)); localStorage.setItem(localStorageALIndex, JSON.stringify($scope.level_name_index)); localStorage.setItem(localStorageALIID, JSON.stringify($scope.access_level_instance_id)); diff --git a/seed/static/seed/js/services/inventory_reports_service.js b/seed/static/seed/js/services/inventory_reports_service.js index 952c67c32a..7aeaf9a532 100644 --- a/seed/static/seed/js/services/inventory_reports_service.js +++ b/seed/static/seed/js/services/inventory_reports_service.js @@ -84,9 +84,9 @@ angular.module('SEED.service.inventory_reports', []).factory('inventory_reports_ } } */ - const get_aggregated_report_data = (xVar, yVar, cycle_ids, access_level_instance_id, filter_group_id) => { + const get_aggregated_report_data = (xVar, yVar, cycle_ids, access_level_instance_id, filter_group_id, aggregationType) => { // Error checks - if ([xVar, yVar, cycle_ids].includes(null)) { + if ([xVar, yVar, cycle_ids, aggregationType].includes(null)) { $log.error('#inventory_reports_service.get_aggregated_report_data(): null parameter'); throw new Error('Invalid Parameter'); } @@ -99,7 +99,8 @@ angular.module('SEED.service.inventory_reports', []).factory('inventory_reports_ y_var: yVar, cycle_ids, access_level_instance_id, - filter_group_id + filter_group_id, + aggregationType } }) .then((response) => response.data) diff --git a/seed/static/seed/locales/en_US.json b/seed/static/seed/locales/en_US.json index e1b8749f73..99c2005508 100644 --- a/seed/static/seed/locales/en_US.json +++ b/seed/static/seed/locales/en_US.json @@ -1517,7 +1517,7 @@ "X-Axis Field Options": "X-Axis Field Options", "XSS_TEST": "Accented téxt.