Skip to content

Commit

Permalink
Merge pull request #3097 from SEED-platform/feature/enable-actions-fr…
Browse files Browse the repository at this point in the history
…ontend

Feature/enable actions frontend
  • Loading branch information
Ryo committed Feb 7, 2022
2 parents 10ead69 + c656a44 commit 621595b
Show file tree
Hide file tree
Showing 9 changed files with 132 additions and 101 deletions.
Binary file modified locale/en_US/LC_MESSAGES/django.mo
Binary file not shown.
15 changes: 11 additions & 4 deletions locale/en_US/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -2233,9 +2233,15 @@ msgstr "Security"
msgid "SeedOrg"
msgstr "SeedOrg"

msgid "Select All"
msgstr "Select All"

msgid "Select All Columns"
msgstr "Select All Columns"

msgid "Select None"
msgstr "Select None"

msgid "Select columns from the list below to make them appear in your Buildings List table."
msgstr "Select columns from the list below to make them appear in your Buildings List table."

Expand Down Expand Up @@ -2485,8 +2491,7 @@ msgstr "The Standard Energy Efficiency Data (SEED)™ Platform is a software app
msgid "The following actions have destructive effects, please read all warnings after clicking an option."
msgstr "The following actions have destructive effects, please read all warnings after clicking an option."

msgid ""
"The following is a list of the fields we use to match up properties/tax lots between different imported files. The more data you have in these four fields the better our"
msgid "The following is a list of the fields we use to match up properties/tax lots between different imported files. The more data you have in these four fields the better our"
" system will auto-match your records."
msgstr "The following is a list of the fields we use to match up properties/tax lots between different imported files. The more data you have in these four fields the better our\n system will auto-match your records."

Expand Down Expand Up @@ -2561,8 +2566,7 @@ msgstr "Type of Submittal"
msgid "Type of Submittal:"
msgstr "Type of Submittal:"

msgid ""
"U.S."
msgid "U.S."
" Department of Energy"
msgstr "U.S. Department of Energy"

Expand Down Expand Up @@ -3095,6 +3099,9 @@ msgstr "saving data"
msgid "saving energy data"
msgstr "saving energy data"

msgid "selected"
msgstr "selected"

#: seed/landing/models.py:60
msgid "shows shared buildings within search results"
msgstr "shows shared buildings within search results"
Expand Down
Binary file modified locale/fr_CA/LC_MESSAGES/django.mo
Binary file not shown.
15 changes: 11 additions & 4 deletions locale/fr_CA/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -2253,9 +2253,15 @@ msgstr "Sécurité"
msgid "SeedOrg"
msgstr "SeedOrg"

msgid "Select All"
msgstr "Tout sélectionner"

msgid "Select All Columns"
msgstr "Sélectionnez toutes les colonnes"

msgid "Select None"
msgstr "Sélectionnez Aucun"

msgid "Select columns from the list below to make them appear in your Buildings List table."
msgstr "Sélectionnez les colonnes de la liste ci-dessous pour les faire apparaître dans votre tableau Liste des bâtiments."

Expand Down Expand Up @@ -2505,8 +2511,7 @@ msgstr "La Plate-forme SEED™ (Standard Energy Efficiency Data) est une applica
msgid "The following actions have destructive effects, please read all warnings after clicking an option."
msgstr "Les actions suivantes ont des effets destructeurs, veuillez lire tous les avertissements après avoir cliqué sur une option."

msgid ""
"The following is a list of the fields we use to match up properties/tax lots between different imported files. The more data you have in these four fields the better our"
msgid "The following is a list of the fields we use to match up properties/tax lots between different imported files. The more data you have in these four fields the better our"
" system will auto-match your records."
msgstr "Voici une liste des champs que nous utilisons pour faire correspondre les propriétés/lots d'impôt entre différents fichiers importés. Le plus de données que vous avez dans ces quatre domaines, le mieux notre système correspondra automatiquement à vos enregistrements."

Expand Down Expand Up @@ -2581,8 +2586,7 @@ msgstr "Type de soumission"
msgid "Type of Submittal:"
msgstr "Type de soumission:"

msgid ""
"U.S."
msgid "U.S."
" Department of Energy"
msgstr "Département Américain de l'Énergie"

Expand Down Expand Up @@ -3117,6 +3121,9 @@ msgstr "enregistrant les données"
msgid "saving energy data"
msgstr "enregistreant des données de l’énergie"

msgid "selected"
msgstr "la sélection"

#: seed/landing/models.py:60
msgid "shows shared buildings within search results"
msgstr "montre les bâtiments partagés dans les résultats de recherche"
Expand Down
179 changes: 90 additions & 89 deletions seed/static/seed/js/controllers/inventory_list_beta_controller.js

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions seed/static/seed/js/services/inventory_service.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,19 @@ angular.module('BE.seed.service.inventory', []).factory('inventory_service', [

var params = {
organization_id: organization_id,
page: page,
per_page: per_page || 999999999,
include_related: include_related,
ids_only: ids_only,
...format_column_sorts(column_sorts),
...format_column_filters(column_filters),
};

if (ids_only) {
params.ids_only = true;
} else {
params.page = page;
params.per_page = per_page || 999999999;
}

return cycle_service.get_cycles().then(function (cycles) {
var validCycleIds = _.map(cycles.cycles, 'id');

Expand Down
3 changes: 3 additions & 0 deletions seed/static/seed/locales/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,9 @@
"Search table name": "Search table name",
"Security": "Security",
"SeedOrg": "SeedOrg",
"Select All": "Select All",
"Select All Columns": "Select All Columns",
"Select None": "Select None",
"Select columns from the list below to make them appear in your Buildings List table.": "Select columns from the list below to make them appear in your Buildings List table.",
"Select columns from the list below to make them appear in your Properties Detail table. Drag the rows to change the order in which they appear.": "Select columns from the list below to make them appear in your Properties Detail table. Drag the rows to change the order in which they appear.",
"Select columns from the list below to make them appear in your Tax Lots Detail table. Drag the rows to change the order in which they appear.": "Select columns from the list below to make them appear in your Tax Lots Detail table. Drag the rows to change the order in which they appear.",
Expand Down Expand Up @@ -986,6 +988,7 @@
"saving complete": "saving complete",
"saving data": "saving data",
"saving energy data": "saving energy data",
"selected": "selected",
"shows shared buildings within search results": "shows shared buildings within search results",
"slug": "slug",
"sq. ft.": "sq. ft.",
Expand Down
3 changes: 3 additions & 0 deletions seed/static/seed/locales/fr_CA.json
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,9 @@
"Search table name": "Rechercher le nom de la table",
"Security": "Sécurité",
"SeedOrg": "SeedOrg",
"Select All": "Tout sélectionner",
"Select All Columns": "Sélectionnez toutes les colonnes",
"Select None": "Sélectionnez Aucun",
"Select columns from the list below to make them appear in your Buildings List table.": "Sélectionnez les colonnes de la liste ci-dessous pour les faire apparaître dans votre tableau Liste des bâtiments.",
"Select columns from the list below to make them appear in your Properties Detail table. Drag the rows to change the order in which they appear.": "Sélectionnez les colonnes de la liste ci-dessous pour les faire apparaître dans votre tableau de détail des propriétés. Faites glisser les lignes pour modifier l'ordre dans lequel elles apparaissent.",
"Select columns from the list below to make them appear in your Tax Lots Detail table. Drag the rows to change the order in which they appear.": "Sélectionnez les colonnes de la liste ci-dessous pour les faire apparaître dans votre tableau de détail des lots d'impôt. Faites glisser les lignes pour modifier l'ordre dans lequel elles apparaissent.",
Expand Down Expand Up @@ -986,6 +988,7 @@
"saving complete": "enregistrement complète",
"saving data": "enregistrant les données",
"saving energy data": "enregistreant des données de l’énergie",
"selected": "la sélection",
"shows shared buildings within search results": "montre les bâtiments partagés dans les résultats de recherche",
"slug": "limace",
"sq. ft.": "pi. ca.",
Expand Down
9 changes: 7 additions & 2 deletions seed/static/seed/partials/inventory_list_beta.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ <h1>{$:: (inventory_type === 'taxlots' ? 'Tax Lots' : 'Properties') | translate
<label>{$:: 'Actions' | translate $}:</label>
<select id="select-actions" class="form-control input-sm grow" ng-model="model_actions" ng-change="run_action()">
<option value="none" selected="selected"></option>
<optgroup label="{$:: 'Selected ' + (inventory_type==='properties' ? 'Properties' : 'Taxlots') | translate $}">
<option value="select_all" ng-disabled="selectedCount === inventory_pagination.total">{$:: 'Select All' | translate $} ({$ inventory_pagination.total $}) </option>
<option value="select_none" ng-disabled="selectedCount < 1">{$:: 'Select None' | translate $}</option>
<optgroup label="{$:: 'Selected ' + (inventory_type === 'properties' ? 'Properties' : 'Taxlots') | translate $} ({$ selected_display $})">
<option value="open_merge_modal" ng-disabled="selectedParentCount < 2" translate>Merge</option>
<option value="open_delete_modal" ng-disabled="selectedCount === 0" translate>Delete</option>
<option value="open_export_modal" ng-disabled="selectedCount === 0" translate>Export</option>
Expand Down Expand Up @@ -79,8 +81,11 @@ <h1>{$:: (inventory_type === 'taxlots' ? 'Tax Lots' : 'Properties') | translate
</div>

<div class="inventory-list-tab-container">
<div class="item-count" ng-class="{'text-info': (filters_exist() || selected_labels.length)}">
<div class="item-count">
{$ inventory_pagination.start $}-{$ inventory_pagination.end $}<span ng-if="inventory_pagination.num_pages > 1"> of {$ inventory_pagination.total $}</span>
<i ng-if="selectedCount > 0">
<span>({$ selected_display $}</span><span ng-if="selectedCount < inventory_pagination.total"> - <a ng-click="select_all()" translate>Select All</a></span><span ng-if="selectedCount === inventory_pagination.total"> - <a ng-click="select_none()" translate>Select None</a></span><span>)</span>
</i>
<button
ng-click="load_inventory(inventory_pagination.page - 1)"
ng-disabled="!inventory_pagination.has_previous"
Expand Down

0 comments on commit 621595b

Please sign in to comment.