diff --git a/seed/static/seed/js/controllers/inventory_reports_controller.js b/seed/static/seed/js/controllers/inventory_reports_controller.js index b485f2075d..a5d6cd2ab4 100644 --- a/seed/static/seed/js/controllers/inventory_reports_controller.js +++ b/seed/static/seed/js/controllers/inventory_reports_controller.js @@ -48,6 +48,7 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re const org_id = organization_payload.organization.id; const base_storage_key = `report.${org_id}`; + $scope.org_id = org_id; $scope.access_level_tree = access_level_tree.access_level_tree; $scope.level_names = access_level_tree.access_level_names; $scope.level_name_index = null; diff --git a/seed/static/seed/locales/en_US.json b/seed/static/seed/locales/en_US.json index b5f1561ba0..b43bebffb1 100644 --- a/seed/static/seed/locales/en_US.json +++ b/seed/static/seed/locales/en_US.json @@ -172,7 +172,9 @@ "COL_MATCHING_CRITERIA_TOGGLE": "Checking this box for a field will allow it to be used as a matching field.", "COL_MERGE_PROTECTION_TOGGLE": "Normally when an imported record is merged into another record the newest value overwrites an older one. Merge protection prevents this, and is particularly useful for columns where you have manually edited values that you want to persist even after importing and merging new data.", "COMPLETE_AND_REFRESH": "Complete and Refresh Page", + "CONFIGURE_CYCLES": "Select one or more cycles from the dropdown above to visualize in the charts below.", "CONFIGURE_PROGRAM": "Need to configure your Program?", + "CONFIGURE_XY_AXES": "to configure the set of columns selectable as X and Y axes. These can be set on the Default Display Fields tab.", "CONFIRMING_DELETE_PROFILE": "Are you sure you want to delete the profile", "CONFIRM_ACCESS_LEVEL_DELETE": "Are you sure you want to delete this access level? This action will also delete {num_access_levels} access level instances.", "CONFIRM_AND_START_MATCHING": "Confirm mappings & start matching", diff --git a/seed/static/seed/locales/fr_CA.json b/seed/static/seed/locales/fr_CA.json index ee5b7595b0..30256350b5 100644 --- a/seed/static/seed/locales/fr_CA.json +++ b/seed/static/seed/locales/fr_CA.json @@ -172,7 +172,9 @@ "COL_MATCHING_CRITERIA_TOGGLE": "Pour les colonnes non extra_data, indiquez si la colonne correspond aux critères", "COL_MERGE_PROTECTION_TOGGLE": "Normalement, lorsqu'un enregistrement importé est fusionné dans un autre enregistrement, la valeur la plus récente remplace un enregistrement plus ancien. La protection de fusion empêche cela et est particulièrement utile pour les colonnes dans lesquelles vous avez manuellement modifié les valeurs que vous souhaitez conserver même après l'importation et la fusion de nouvelles données.", "COMPLETE_AND_REFRESH": "Complétez et Actualisez la Page", + "CONFIGURE_CYCLES": "Sélectionnez un ou plusieurs cycles dans la liste déroulante ci-dessus pour visualiser dans les graphiques ci-dessous.", "CONFIGURE_PROGRAM": "Besoin de configurer votre programme?", + "CONFIGURE_XY_AXES": "pour configurer l'ensemble des colonnes sélectionnables comme axes X et Y. Ceux-ci peuvent être définis dans l’onglet Champs d’affichage par défaut.", "CONFIRMING_DELETE_PROFILE": "Êtes-vous sûr de vouloir supprimer le profil", "CONFIRM_ACCESS_LEVEL_DELETE": "Êtes-vous sûr de vouloir supprimer ce niveau d'accès? Cette action supprimera également {num_access_levels} instances de niveau d'accès.", "CONFIRM_AND_START_MATCHING": "Confirmer et commencer l'appariement", diff --git a/seed/static/seed/partials/inventory_reports.html b/seed/static/seed/partials/inventory_reports.html index f8824feeba..a2d0e1d029 100644 --- a/seed/static/seed/partials/inventory_reports.html +++ b/seed/static/seed/partials/inventory_reports.html @@ -54,6 +54,9 @@

+
+

CONFIGURE_CYCLES

+
@@ -66,6 +69,13 @@

{$:: 'Y Axis' | translate $}:

+
+

+ Visit + {$:: 'Organization Settings' | translate $} + CONFIGURE_XY_AXES +

+