Skip to content

Commit

Permalink
add helptext to default reports controls at top of page (#4739)
Browse files Browse the repository at this point in the history
* add helptext to default reports controls at top of page

* lint
  • Loading branch information
kflemin authored Aug 8, 2024
1 parent 431d8fc commit 65f7b22
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions seed/static/seed/locales/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions seed/static/seed/locales/fr_CA.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 10 additions & 0 deletions seed/static/seed/partials/inventory_reports.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ <h2 class="property-report-header"><i class="fa-solid fa-bar-chart pull-left"></
</select>
</li>
</div>
<div class="form-group pad-top-10">
<p translate>CONFIGURE_CYCLES</p>
</div>
</div>

<div style="display: flex; flex-direction: column; flex: 1 1 0">
Expand All @@ -66,6 +69,13 @@ <h2 class="property-report-header"><i class="fa-solid fa-bar-chart pull-left"></
<label for="yAxisSelector">{$:: 'Y Axis' | translate $}:</label>
<select class="form-control" id="yAxisSelector" ng-model="yAxisSelectedItem" ng-options="y.name for y in yAxisVars track by y.varName"></select>
</div>
<div class="form-group pad-top-10">
<p>
<span translate>Visit</span>
<a ui-sref="organization_settings(::{organization_id: org_id})">{$:: 'Organization Settings' | translate $}</a>
<span translate>CONFIGURE_XY_AXES</span>
</p>
</div>
</div>
<div style="display: flex; flex-direction: column; align-self: flex-end">
<div class="form-group" style="padding-bottom: 20px; text-align: right">
Expand Down

0 comments on commit 65f7b22

Please sign in to comment.