diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a21d3e7908..2746b1cdb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,7 @@ on: branches: - "develop" - "main" + - "AH/develop" jobs: # Currently GH Actions provides no simple method for "sharing" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index aff8ac5a14..b0c7c34578 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,6 +4,7 @@ on: push: branches: - develop + - AH/develop tags: - "*" workflow_dispatch: @@ -43,6 +44,8 @@ jobs: if [[ ${GITHUB_EVENT_NAME} == "push" ]]; then if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then SEED_TAG=seedplatform/seed:develop + elif [[ "${GITHUB_REF}" == "refs/heads/AH/develop" ]]; then + SEED_TAG=seedplatform/seed:develop-ah elif [[ "${GITHUB_REF}" =~ "refs/tags/v" ]]; then # you can have multiple tags, separated by commas SEED_TAG=seedplatform/seed:${GITHUB_REF#refs/tags/v},seedplatform/seed:latest diff --git a/config/settings/common.py b/config/settings/common.py index 5e8d077b1e..fa105d9a6f 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -103,6 +103,7 @@ 'crispy_forms', # needed to squash warnings around collectstatic with rest_framework 'post_office', 'django_celery_beat', + 'treebeard', ) @@ -148,7 +149,6 @@ ], 'js': [ 'compressor.filters.jsmin.JSMinFilter', - 'compressor.filters.yuglify.YUglifyJSFilter', ] } STATICFILES_DIRS = [ diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo index fab5a46cbf..969638ad05 100644 Binary files a/locale/en_US/LC_MESSAGES/django.mo and b/locale/en_US/LC_MESSAGES/django.mo differ diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index d84446e63a..a1842105be 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -56,9 +56,42 @@ msgstr "A list of your imported headers." msgid "A preview of your concatenated data will appear in the box below." msgstr "A preview of your concatenated data will appear in the box below." +msgid "ACCESS_LEVEL_DELETE_AREYOUSURE" +msgstr "Are you sure you want to delete this Access Level Instance? The operation will also delete all Access Level Instances below this one." + +msgid "ACCESS_LEVEL_DESCRIPTION" +msgstr " Define access levels to structure your organization's content. An organization can have one or more access levels. All organizations have at least one level (level 1), which is named with the organization name by default. All access level names are customizable." + msgid "ACCESS_LEVEL_FILENAME_UPLOADED" msgstr "Access Level Instances File has been uploaded" +msgid "ACCESS_LEVEL_INSTANCE_DESCRIPTION" +msgstr "Access level instances are custom subgroups that can be defined within each access level. These ALIs are used to associate content together and restrict user access to data. There is a single ALI in level 1 of the hierarchy, the root of the tree. This is named 'root' by default, but can be customized. All other levels can contain one or more ALIs." + +msgid "ACCESS_LEVEL_ORG_OWNER" +msgstr "As an organization owner, you can set the structure of your access level tree using the buttons below. This process should be performed prior to importing data and adding users to your organization." + +msgid "ACCESS_LEVEL_OWNER_END" +msgstr "Once you have configured your organization's access level tree, you are ready to add users and properties to different levels of the tree." + +msgid "ACCESS_LEVEL_OWNER_STEP1" +msgstr "Configure the number and name of your access levels using the Edit/Add Access Levels button." + +msgid "ACCESS_LEVEL_OWNER_STEP2" +msgstr "Upload a spreadsheet of access level instances. The spreadsheet should have a column for each access level, with the header matching your customized level name. Access level instances make up the rows of the spreadsheet. Make sure to fully define the path of each access level instance. You can also select the level, parent access level instance, and configure the name of a single new access level instance using the Add Access Level Instance button." + +msgid "ACCESS_LEVEL_ROOT_TEXT" +msgstr "There is only one access level instance allowed at the root of the tree (level 1). Click on the pencil icon if you wish to rename it." + +msgid "ACCESS_LEVEL_STRUCTURE_UPLOAD_TEXT" +msgstr "Upload your Organizational Structure in spreadsheet form. The file should include a column for each access level with its column header equal to the custom access level name. Each row should contain an access level instance, with its ancestry fully defined (parent node name, grand-parent node name, etc.)" + +msgid "ACCESS_LEVEL_TREE_HELP_1" +msgstr "This page allows you to view the structure of your organization's content. The structure is made up of hierarchical levels that define a tree; these are called access levels. Each level contains one or more nodes, called access level instances. Permissions are managed by associating content and users with a particular access level instance, thereby grouping and restricting access to the content. The number of access levels in your structure, the names of the levels, and the names of the access level instances are customizable." + +msgid "ACCESS_LEVEL_UPLOAD_PROGRESS_MSG" +msgstr "Saving access level instances in progress... This process depends on the size of your file and may take several minutes." + msgid "ADD_FILES_TO" msgstr "Add files to {dataset_name}." @@ -125,6 +158,33 @@ msgstr "Accept" msgid "Accept Terms of Service?" msgstr "Accept Terms of Service?" +msgid "Access Level" +msgstr "Access Level" + +msgid "Access Level Instance" +msgstr "Access Level Instance" + +msgid "Access Level Instance Information" +msgstr "Access Level Instance Information" + +msgid "Access Level Instance Tree" +msgstr "Access Level Instance Tree" + +msgid "Access Level Instances Errors" +msgstr "Access Level Instances Errors" + +msgid "Access Level Tree" +msgstr "Access Level Tree" + +msgid "Access Levels" +msgstr "Access Levels" + +msgid "Access Levels (AL)" +msgstr "Access Levels (AL)" + +msgid "Access Levels Instances (ALI)" +msgstr "Access Levels Instances (ALI)" + msgid "Acknowledge" msgstr "Acknowledge" @@ -147,6 +207,9 @@ msgstr "Actual Field" msgid "Add" msgstr "Add" +msgid "Add Access Level" +msgstr "Add Access Level" + msgid "Add Column" msgstr "Add Column" @@ -156,6 +219,12 @@ msgstr "Add Data Files" msgid "Add Label" msgstr "Add Label" +msgid "Add Level Instance (Node) to the Organizational Structure" +msgstr "Add Level Instance (Node) to the Organizational Structure" + +msgid "Add Levels to the Organizational Structure Tree" +msgstr "Add Levels to the Organizational Structure Tree" + msgid "Add Mapping" msgstr "Add Mapping" @@ -276,6 +345,12 @@ msgstr "Are you sure you want to unmerge these tax lots and then merge with the msgid "Area" msgstr "Area" +msgid "Area Column" +msgstr "Area Column" + +msgid "Area Target Column" +msgstr "Area Target Column" + msgid "As the admin of your SEED instance you can control what data is shared throughout your organization and between your sub-organizations as well as what data is shared externally with the public-at-large. The subset of data you choose to share with the public can be different than the subset shared between your sub-organizations." msgstr "As the admin of your SEED instance you can control what data is shared throughout your organization and between your sub-organizations as well as what data is shared externally with the public-at-large. The subset of data you choose to share with the public can be different than the subset shared between your sub-organizations." @@ -336,6 +411,9 @@ msgstr "Back to List" msgid "Back to Mapping" msgstr "Back to Mapping" +msgid "Baseline Cycle" +msgstr "Baseline Cycle" + #: seed/models/models.py:135 msgid "Benchmarking" msgstr "Benchmarking" @@ -433,6 +511,9 @@ msgstr "Need to configure your Program?" msgid "CONFIRMING_DELETE_PROFILE" msgstr "Are you sure you want to delete the profile" +msgid "CONFIRM_ACCESS_LEVEL_DELETE" +msgstr "Are you sure you want to delete this access level? This action will also delete {num_access_levels} access level instances." + msgid "CONFIRM_AND_START_MATCHING" msgstr "Confirm mappings & start matching" @@ -467,6 +548,9 @@ msgstr "Cancel" msgid "Cannot delete protected objects while related objects still exist" msgstr "Cannot delete protected objects while related objects still exist" +msgid "Cannot delete this access level instance." +msgstr "Cannot delete this access level instance." + msgid "Change Merged Property" msgstr "Change Merged Property" @@ -598,6 +682,9 @@ msgstr "Conditioned Floor Area" msgid "Configuration" msgstr "Configuration" +msgid "Configure Goals" +msgstr "Configure Goals" + #: seed/landing/templates/landing/password_reset_confirm.html:64 #: seed/landing/templates/landing/signup.html:63 msgid "Confirm" @@ -737,6 +824,12 @@ msgstr "Cross-Cycles" msgid "Current Column Mapping Profile" msgstr "Current Column Mapping Profile" +msgid "Current Cycle" +msgstr "Current Cycle" + +msgid "Current Cycle will be measured against Baseline Cycle" +msgstr "Current Cycle will be measured against Baseline Cycle" + msgid "Current Filters" msgstr "Current Filters" @@ -755,6 +848,9 @@ msgstr "Custom ID 1 (Property)" msgid "Custom ID 1 (Tax Lot)" msgstr "Custom ID 1 (Tax Lot)" +msgid "Custom Name for Level" +msgstr "Custom Name for Level" + msgid "Custom Reports" msgstr "Custom Reports" @@ -767,6 +863,9 @@ msgstr "Cycle" msgid "Cycle Name" msgstr "Cycle Name" +msgid "Cycle Selection" +msgstr "Cycle Selection" + msgid "Cycle updated." msgstr "Cycle updated." @@ -905,6 +1004,9 @@ msgstr "Default Display Fields" msgid "Delete" msgstr "Delete" +msgid "Delete Access Level Instance" +msgstr "Delete Access Level Instance" + msgid "Delete All Mappings" msgstr "Delete All Mappings" @@ -1045,6 +1147,9 @@ msgstr "Choose an EnergyStar Portfolio Manager (ESPM) data importing method belo msgid "EUI" msgstr "EUI" +msgid "EUI Target Columns" +msgstr "EUI Target Columns" + msgid "EXCLUDE" msgstr "EXCLUDE" @@ -1054,6 +1159,9 @@ msgstr "For “extra data” fields, this allows the user to set the type, such msgid "Edit" msgstr "Edit" +msgid "Edit Access Level Instance Name" +msgstr "Edit Access Level Instance Name" + msgid "Edit Name" msgstr "Edit Name" @@ -1105,6 +1213,9 @@ msgstr "English" msgid "Enter Email Address" msgstr "Enter Email Address" +msgid "Enter a Name for the new Access Level Instance" +msgstr "Enter a Name for the new Access Level Instance" + msgid "Enter a valid email address." msgstr "Enter a valid email address." @@ -1132,6 +1243,9 @@ msgstr "Error" msgid "Error Processing Data" msgstr "Error Processing Data" +msgid "Example Access Level Tree" +msgstr "Example Access Level Tree" + msgid "Example Usage" msgstr "Example Usage" @@ -1351,6 +1465,12 @@ msgstr "Geocoding now..." msgid "GJ/m²/year" msgstr "GJ/m²/year" +msgid "GOAL" +msgstr "GOAL" + +msgid "GOAL_SETUP_TEXT" +msgstr "Configure one or more portfolio Energy Use Intensity (EUI) reduction goals below. Select a baseline cycle and a current cycle for comparison, indicate the level in your access level tree that this goal applies to, specify a percentage EUI improvement target, and indicate which fields in your data should be used for EUI and square footage information." + msgid "GREENBUTTON_CONTENTS_TITLE" msgstr "Confirm GreenButton File Contents" @@ -1397,6 +1517,9 @@ msgstr "Go to Meters" msgid "Go to Notes" msgstr "Go to Notes" +msgid "Goal Setup" +msgstr "Goal Setup" + msgid "Gross Floor Area" msgstr "Gross Floor Area" @@ -1415,6 +1538,12 @@ msgstr "HTTP Error! Status Code: 404. The requested URL was not found." msgid "HTTP Error! Status Code: 500. Internal Server Error." msgstr "HTTP Error! Status Code: 500. Internal Server Error." +msgid "Have your organization owner update the column's data type to \"Area\"" +msgstr "Have your organization owner update the column's data type to \"Area\"" + +msgid "Have your organization owner update the data type of the column to \"EUI\"" +msgstr "Have your organization owner update the data type of the column to \"EUI\"" + #: seed/templates/seed/account_create_email.html:2 msgid "Hello %(first_name)s, " msgstr "Hello %(first_name)s, " @@ -1633,6 +1762,15 @@ msgstr "Left Axis" msgid "Left Half" msgstr "Left Half" +msgid "Level" +msgstr "Level" + +msgid "Level Instance" +msgstr "Level Instance" + +msgid "Loading Summary Data..." +msgstr "Loading Summary Data..." + msgid "Loading data..." msgstr "Loading data..." @@ -1752,6 +1890,9 @@ msgstr "Manage compliance" msgid "Managed by" msgstr "Managed by" +msgid "Managing the Access Level Tree" +msgstr "Managing the Access Level Tree" + msgid "Manual Matching" msgstr "Manual Matching" @@ -1975,6 +2116,9 @@ msgstr "National Renewable Energy Laboratory" msgid "New Analysis" msgstr "New Analysis" +msgid "New Goal" +msgstr "New Goal" + msgid "New Note" msgstr "New Note" @@ -2040,6 +2184,9 @@ msgstr "Not Null" msgid "Not all inventory items were successfully deleted" msgstr "Not all inventory items were successfully deleted" +msgid "Not seeing your column?" +msgstr "Not seeing your column?" + msgid "Note:" msgstr "Note:" @@ -2180,6 +2327,9 @@ msgstr "Portfolio Manager Meter Import Results" msgid "PM_PROPERTY_ID_MATCHING_CRITERIA_WARNING" msgstr "Removing PM Property ID from matching criteria can cause unexpected issues for Portfolio Manager Meter imports." +msgid "PORTFOLIO_SUMMARY_HEADER_TEXT" +msgstr "The portfolio summary page compares 2 cycles to calculate progress toward an Energy Use Intensity reduction goal. Cycle selection and goal details can be customized by clicking the Configure Goals button below." + msgid "POST_GEOCODING_COUNTS" msgstr "Updated counts after geocoding" @@ -2271,6 +2421,15 @@ msgstr "Please wait while your data is loaded..." msgid "Populate SEED Headers with best known matches" msgstr "Populate SEED Headers with best known matches" +msgid "Portfolio Summary" +msgstr "Portfolio Summary" + +msgid "Portfolio Summary will only include properties belonging to this Access Level Instance." +msgstr "Portfolio Summary will only include properties belonging to this Access Level Instance." + +msgid "Portfolio Target" +msgstr "Portfolio Target" + msgid "Postal Code" msgstr "Postal Code" @@ -2298,6 +2457,9 @@ msgstr "Preview Loading" msgid "Previous" msgstr "Previous" +msgid "Primary Column" +msgstr "Primary Column" + msgid "Primary Tax Lot ID" msgstr "Primary Tax Lot ID" @@ -2437,6 +2599,9 @@ msgstr "Rename allows users to change the name of the underlying field shown in msgid "REVIEW YOUR DATA MAPPINGS" msgstr "REVIEW YOUR DATA MAPPINGS" +msgid "REVIEW_MATCHING_CRITERIA" +msgstr "Review your matching criteria on the Column Settings page before importing data for the first time. You will not be able to remove fields from the matching criteria after data is added to your organization." + msgid "Read more here." msgstr "Read more here." @@ -2471,6 +2636,9 @@ msgstr "Related Tax Lots" msgid "Remove" msgstr "Remove" +msgid "Remove Access Level" +msgstr "Remove Access Level" + msgid "Remove Column Mappings" msgstr "Remove Column Mappings" @@ -2778,6 +2946,9 @@ msgstr "STEP 1: Map Your Data" msgid "STEP 2: Review Your Data Mappings" msgstr "STEP 2: Review Your Data Mappings" +msgid "SUB_ORG_DEPRECATION" +msgstr "The Sub-Organization functionality is no longer recommended and will be deprecated soon. Visit the Access Level Tree page to define access levels to structure your organization's content." + msgid "SUGGEST_TO_VERIFY" msgstr "Please verify before continuing." @@ -2838,6 +3009,9 @@ msgstr "Search field name" msgid "Search table name" msgstr "Search table name" +msgid "Secondary (optional)" +msgstr "Secondary (optional)" + msgid "Security" msgstr "Security" @@ -2885,6 +3059,12 @@ msgstr "Select columns from the lists below to make them appear on the left or r msgid "Select one or more filter groups to load your inventory." msgstr "Select one or more filter groups to load your inventory." +msgid "Select the Level at which you want to add the new Instance" +msgstr "Select the Level at which you want to add the new Instance" + +msgid "Select the new Instance's Parent Access Level Instance" +msgstr "Select the new Instance's Parent Access Level Instance" + msgid "Select the type of file(s) you would like to add to" msgstr "Select the type of file(s) you would like to add to" @@ -3013,6 +3193,12 @@ msgstr "State (Property)" msgid "State (Tax Lot)" msgstr "State (Tax Lot)" +msgid "Step 1: Add Access Levels" +msgstr "Step 1: Add Access Levels" + +msgid "Step 2: Upload Access Level Instances" +msgstr "Step 2: Upload Access Level Instances" + msgid "Sub-Org Name" msgstr "Sub-Org Name" @@ -3079,6 +3265,9 @@ msgstr "Target Column" msgid "Target Field" msgstr "Target Field" +msgid "Target to quantify Portfolio EUI improvement. Must be between 0 and 100." +msgstr "Target to quantify Portfolio EUI improvement. Must be between 0 and 100." + msgid "Tax Lot" msgstr "Tax Lot" @@ -3128,6 +3317,9 @@ msgstr "Terms of Service" msgid "Terms of Service as of %(tos.created|date:\"SHORT_DATE_FORMAT\")s" msgstr "Terms of Service as of %(tos.created|date:\"SHORT_DATE_FORMAT\")s" +msgid "Tertiary (optional)" +msgstr "Tertiary (optional)" + msgid "Test Connection" msgstr "Test Connection" @@ -3209,8 +3401,8 @@ msgstr "There is also a link to the SEED-Platform Users forum, where you can con msgid "There was an error loading the page" msgstr "There was an error loading the page" -msgid "This action replaces any of your current columns with the comma-delmited columns you provided. Would you like to continue?" -msgstr "This action replaces any of your current columns with the comma-delmited columns you provided. Would you like to continue?" +msgid "This action replaces any of your current columns with the comma-delimited columns you provided. Would you like to continue?" +msgstr "This action replaces any of your current columns with the comma-delimited columns you provided. Would you like to continue?" msgid "This action updates properties within the selected cycle with data from the Audit Template account associated with this organization. Only Properties with Audit Template Building IDs corresponding to those saved in Audit Template will be updated." msgstr "This action updates properties within the selected cycle with data from the Audit Template account associated with this organization. Only Properties with Audit Template Building IDs corresponding to those saved in Audit Template will be updated." @@ -3409,6 +3601,12 @@ msgstr "Update Salesforce" msgid "Update UBID" msgstr "Update UBID" +msgid "Update the data type of the column to \"Area\" in" +msgstr "Update the column's data type to \"Area\" in" + +msgid "Update the data type of the column to \"EUI\" in" +msgstr "Update the data type of the column to \"EUI\" in" + msgid "Update with Audit Template" msgstr "Update with Audit Template" @@ -3849,6 +4047,9 @@ msgstr "first name" msgid "for your SEED Platform user account" msgstr "for your SEED Platform user account" +msgid "goal" +msgstr "Goal" + #: seed/models/models.py:183 msgid "gray" msgstr "gray" diff --git a/locale/fr_CA/LC_MESSAGES/django.mo b/locale/fr_CA/LC_MESSAGES/django.mo index e73f313759..581b1fb6a6 100644 Binary files a/locale/fr_CA/LC_MESSAGES/django.mo and b/locale/fr_CA/LC_MESSAGES/django.mo differ diff --git a/locale/fr_CA/LC_MESSAGES/django.po b/locale/fr_CA/LC_MESSAGES/django.po index 817d0acab1..085ccd3808 100644 --- a/locale/fr_CA/LC_MESSAGES/django.po +++ b/locale/fr_CA/LC_MESSAGES/django.po @@ -57,9 +57,42 @@ msgstr "Une liste de vos en-têtes importés." msgid "A preview of your concatenated data will appear in the box below." msgstr "Un aperçu de vos données concaténées apparaîtra dans la case ci-dessous." +msgid "ACCESS_LEVEL_DELETE_AREYOUSURE" +msgstr "Êtes-vous sûr de vouloir supprimer cette instance de niveau d'accès ? L'opération supprimera également toutes les instances de niveau d'accès inférieures à celle-ci." + +msgid "ACCESS_LEVEL_DESCRIPTION" +msgstr "Définissez des niveaux d'accès pour structurer le contenu de votre organisation. Une organisation peut avoir un ou plusieurs niveaux d'accès. Toutes les organisations ont au moins un niveau (niveau 1), nommé par défaut avec le nom de l'organisation. Tous les noms de niveaux d'accès sont personnalisables." + msgid "ACCESS_LEVEL_FILENAME_UPLOADED" msgstr "Le fichier d'instances de niveau d'accès a été téléchargé" +msgid "ACCESS_LEVEL_INSTANCE_DESCRIPTION" +msgstr "Les instances de niveau d'accès sont des sous-groupes personnalisés qui peuvent être définis au sein de chaque niveau d'accès. Ces ALI sont utilisées pour associer du contenu et restreindre l'accès des utilisateurs aux données. Il existe une seule ALI au niveau 1 de la hiérarchie, la racine du graphe en arbre. Celui-ci est nommé « racine » par défaut, mais peut être personnalisé. Tous les autres niveaux peuvent contenir une ou plusieurs ALI." + +msgid "ACCESS_LEVEL_ORG_OWNER" +msgstr "En tant que propriétaire d'une organisation, vous pouvez définir la structure de votre graphe en arbre de niveaux d'accès à l'aide des boutons ci-dessous. Ce processus doit être effectué avant d'importer des données et d'ajouter des utilisateurs à votre organisation." + +msgid "ACCESS_LEVEL_OWNER_END" +msgstr "Une fois que vous avez configuré le graphe en arbre des niveaux d'accès de votre organisation, vous êtes prêt à ajouter des utilisateurs et des propriétés aux différents niveaux de l'arbre." + +msgid "ACCESS_LEVEL_OWNER_STEP1" +msgstr "Configurez le numéro et le nom de vos niveaux d'accès à l'aide du bouton Modifier/Ajouter des niveaux d'accès." + +msgid "ACCESS_LEVEL_OWNER_STEP2" +msgstr "Téléchargez une feuille de calcul des instances de niveau d'accès. La feuille de calcul doit avoir un colonne pour chaque niveau d'accès, avec l'en-tête correspondant à votre nom de niveau personnalisé. Les instances de niveau d'accès constituent les lignes de la feuille de calcul. Assurez-vous de définir entièrement le chemin de chaque instance de niveau d’accès. Vous pouvez également sélectionner le niveau, l'instance de niveau d'accès parent et configurer le nom d'une seule nouvelle instance de niveau d'accès à l'aide du bouton Ajouter une instance de niveau d'accès." + +msgid "ACCESS_LEVEL_ROOT_TEXT" +msgstr "Il n'y a qu'une seule instance de niveau d'accès autorisée à la racine du graphe en arbre (niveau 1). Cliquez sur l'icône en forme de crayon si vous souhaitez le renommer." + +msgid "ACCESS_LEVEL_STRUCTURE_UPLOAD_TEXT" +msgstr "Téléchargez votre structure organisationnelle sous forme de feuille de calcul. Le fichier doit inclure une colonne pour chaque niveau d'accès avec son en-tête de colonne égal au nom du niveau d'accès personnalisé. Chaque ligne doit contenir une instance de niveau d'accès, avec son ascendance entièrement définie (nom du nœud parent, nom du nœud grand-parent, etc.)" + +msgid "ACCESS_LEVEL_TREE_HELP_1" +msgstr "Cette page vous permet de visualiser la structure du contenu de votre organisation. La structure est constituée de niveaux hiérarchiques qui définissent une arborescence ; c'est ce qu'on appelle les niveaux d'accès. Chaque niveau contient un ou plusieurs nœuds, appelés instances de niveau d'accès. Les autorisations sont gérées en associant le contenu et les utilisateurs à une instance de niveau d'accès particulière, regroupant et restreignant ainsi l'accès au contenu. Le nombre de niveaux d'accès dans votre structure, les noms des niveaux et les noms des instances de niveau d'accès sont personnalisables." + +msgid "ACCESS_LEVEL_UPLOAD_PROGRESS_MSG" +msgstr "Enregistrement des instances de niveau d'accès en cours... Ce processus dépend de la taille de votre fichier et peut prendre plusieurs minutes." + msgid "ADD_FILES_TO" msgstr "Ajoutez des fichiers à {dataset_name}." @@ -127,6 +160,33 @@ msgstr "Acceptez" msgid "Accept Terms of Service?" msgstr "Accepter les conditions d'utilisation?" +msgid "Access Level" +msgstr "Niveau d'accès" + +msgid "Access Level Instance" +msgstr "Instance de niveau d'accès" + +msgid "Access Level Instance Information" +msgstr "Informations sur l'instance de niveau d'accès" + +msgid "Access Level Instance Tree" +msgstr "Graphe en arbre des instances de niveau d'accès" + +msgid "Access Level Instances Errors" +msgstr "Erreurs d’instances de niveau d’accès" + +msgid "Access Level Tree" +msgstr "Graphe en arbre des niveaux d'accès" + +msgid "Access Levels" +msgstr "Niveaux d'accès" + +msgid "Access Levels (AL)" +msgstr "Niveaux d'accès (AL)" + +msgid "Access Levels Instances (ALI)" +msgstr "Instances de niveaux d'accès (ALI)" + msgid "Acknowledge" msgstr "Reconnaître" @@ -149,6 +209,9 @@ msgstr "Champ réel" msgid "Add" msgstr "Ajouter" +msgid "Add Access Level" +msgstr "Ajouter un niveau d'accès" + msgid "Add Column" msgstr "Ajouter une colonne" @@ -158,6 +221,12 @@ msgstr "Ajouter des fichiers de données" msgid "Add Label" msgstr "Ajouter une étiquette" +msgid "Add Level Instance (Node) to the Organizational Structure" +msgstr "Ajouter une instance de niveau (nœud) à la structure organisationnelle" + +msgid "Add Levels to the Organizational Structure Tree" +msgstr "Ajouter des niveaux à l'arbre de la structure organisationnelle" + msgid "Add Mapping" msgstr "Ajouter une configuration" @@ -278,6 +347,12 @@ msgstr "Êtes-vous sûr de vouloir annuler la fusion de ces lots fiscaux pour en msgid "Area" msgstr "Superficie" +msgid "Area Column" +msgstr "Colonne de Superficie" + +msgid "Area Target Column" +msgstr "Colonne Cible de Superficie" + msgid "As the admin of your SEED instance you can control what data is shared throughout your organization and between your sub-organizations as well as what data is shared externally with the public-at-large. The subset of data you choose to share with the public can be different than the subset shared between your sub-organizations." msgstr "En tant qu'administrateur de votre instance SEED, vous pouvez contrôler les données partagées dans votre organisation et entre vos sous-organisations ainsi que les données partagées à l'externe avec le public. Le sous-ensemble de données que vous choisissez de partager avec le public peut être différent du sous-ensemble partagé entre vos sous-organisations." @@ -338,6 +413,9 @@ msgstr "Retour à la Liste" msgid "Back to Mapping" msgstr "Retournez à les mappages" +msgid "Baseline Cycle" +msgstr "Cycle de référence" + #: seed/models/models.py:135 #, fuzzy msgid "Benchmarking" @@ -439,6 +517,9 @@ msgstr "Besoin de configurer votre programme?" msgid "CONFIRMING_DELETE_PROFILE" msgstr "Êtes-vous sûr de vouloir supprimer le profil" +msgid "CONFIRM_ACCESS_LEVEL_DELETE" +msgstr "Ê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." + msgid "CONFIRM_AND_START_MATCHING" msgstr "Confirmer et commencer l'appariement" @@ -474,6 +555,9 @@ msgstr "Annuler" msgid "Cannot delete protected objects while related objects still exist" msgstr "Impossible de supprimer des objets protégés alors que des objets apparentés existent toujours" +msgid "Cannot delete this access level instance." +msgstr "Impossible de supprimer cette instance de niveau d'accès." + msgid "Change Merged Property" msgstr "Modifier la propriété fusionnée" @@ -606,6 +690,9 @@ msgstr "Surface climatisé" msgid "Configuration" msgstr "Configuration" +msgid "Configure Goals" +msgstr "Configurer les Objectifs" + #: seed/landing/templates/landing/password_reset_confirm.html:64 #: seed/landing/templates/landing/signup.html:63 msgid "Confirm" @@ -746,6 +833,12 @@ msgstr "Entre les Cycles" msgid "Current Column Mapping Profile" msgstr "Profil de mappage de colonne actuel" +msgid "Current Cycle" +msgstr "Cycle actuel" + +msgid "Current Cycle will be measured against Baseline Cycle" +msgstr "Le cycle actuel sera mesuré par rapport au cycle de référence" + msgid "Current Filters" msgstr "Filtres Actuel" @@ -764,6 +857,9 @@ msgstr "ID personnalisé 1 (propriété)" msgid "Custom ID 1 (Tax Lot)" msgstr "ID personnalisé 1 (lot d'impôt)" +msgid "Custom Name for Level" +msgstr "Nom personnalisé pour le niveau" + msgid "Custom Reports" msgstr "Rapports" @@ -776,6 +872,9 @@ msgstr "Cycle" msgid "Cycle Name" msgstr "Nom du cycle" +msgid "Cycle Selection" +msgstr "Sélection des cycles" + msgid "Cycle updated." msgstr "Cycle mis à jour." @@ -914,6 +1013,9 @@ msgstr "Champs d'affichage par défaut" msgid "Delete" msgstr "Supprimer" +msgid "Delete Access Level Instance" +msgstr "Supprimer une instance de niveau d'accès" + msgid "Delete All Mappings" msgstr "Supprimer tous les mappages" @@ -1055,6 +1157,9 @@ msgstr "Choisissez une méthode d'importation de données EnergyStar Portfolio M msgid "EUI" msgstr "IUE" +msgid "EUI Target Columns" +msgstr "Colonnes cibles EUI" + msgid "EXCLUDE" msgstr "EXCLURE" @@ -1064,6 +1169,9 @@ msgstr "Pour les champs «données supplémentaires», cela permet à l'utilisat msgid "Edit" msgstr "Modifier" +msgid "Edit Access Level Instance Name" +msgstr "Modifier le nom de l'instance du niveau d'accès" + msgid "Edit Name" msgstr "Modifier le nom" @@ -1116,6 +1224,9 @@ msgstr "Anglais" msgid "Enter Email Address" msgstr "Entrer l'adresse e-mail" +msgid "Enter a Name for the new Access Level Instance" +msgstr "Entrez un nom pour la nouvelle instance de niveau d'accès" + msgid "Enter a valid email address." msgstr "Entrez une adresse mail valide." @@ -1143,6 +1254,9 @@ msgstr "Erreur" msgid "Error Processing Data" msgstr "Erreur lors du traitement des données" +msgid "Example Access Level Tree" +msgstr "Exemple de graphe en arbre de niveaux d'accès" + msgid "Example Usage" msgstr "Exemple d'utilisation" @@ -1364,6 +1478,12 @@ msgstr "Géocodage maintenant ..." msgid "GJ/m²/year" msgstr "GJ/m²/année" +msgid "GOAL" +msgstr "OBJECTIF" + +msgid "GOAL_SETUP_TEXT" +msgstr "Configurez un ou plusieurs objectifs de réduction de l'intensité de l'utilisation d'énergie (IUE) du portefeuille ci-dessous. Sélectionnez un cycle de référence et un cycle actuel à des fins de comparaison, identifiez le niveau dans votre arborescence de niveaux d'accès auquel cet objectif s'applique, spécifiez un objectif d'amélioration de l'IUE en pourcentage et indiquez quels champs de vos données doivent être utilisés pour les informations sur l'IUE et la superficie en pieds carrés." + msgid "GREENBUTTON_CONTENTS_TITLE" msgstr "Confirmer le contenu du fichier GreenButton" @@ -1410,6 +1530,9 @@ msgstr "Aller aux compteurs" msgid "Go to Notes" msgstr "Accéder aux Notes" +msgid "Goal Setup" +msgstr "Configuration des objectifs" + msgid "Gross Floor Area" msgstr "Surface brute" @@ -1428,6 +1551,12 @@ msgstr "Erreur HTTP! Code d'état : 404. L'URL demandée est introuvable." msgid "HTTP Error! Status Code: 500. Internal Server Error." msgstr "Erreur HTTP! Code d'état : 500. Erreur interne du serveur." +msgid "Have your organization owner update the column's data type to \"Area\"" +msgstr "Demandez au propriétaire de votre organisation d s'assurer que le type de données de la colonne est \"Area\" dans" + +msgid "Have your organization owner update the data type of the column to \"EUI\"" +msgstr "Demandez au propriétaire de votre organisation de mettre à jour le type de données de la colonne en \"EUI\"." + #: seed/templates/seed/account_create_email.html:2 msgid "Hello %(first_name)s, " msgstr "Bonjour% (first_name) s," @@ -1648,6 +1777,15 @@ msgstr "Axe gauche" msgid "Left Half" msgstr "Moitié gauche" +msgid "Level" +msgstr "Niveau" + +msgid "Level Instance" +msgstr "Instance de niveau" + +msgid "Loading Summary Data..." +msgstr "Chargement des données récapitulatives..." + msgid "Loading data..." msgstr "Chargeant les données ..." @@ -1767,6 +1905,9 @@ msgstr "Gérer la conformité" msgid "Managed by" msgstr "Dirigé par" +msgid "Managing the Access Level Tree" +msgstr "Graphe en arbre des niveaux d'accès" + msgid "Manual Matching" msgstr "Correspondance manuelle" @@ -1983,7 +2124,7 @@ msgid "NUM_PROPERTY_TAXLOT_COLUMNS_AVAILABLE" msgstr "Il existe {num_property_columns} colonnes de propriétés et {num_taxlot_columns} colonnes de lot d'impôt qui vous sont accessibles." msgid "Name" -msgstr "nom" +msgstr "Nom" msgid "National Renewable Energy Laboratory" msgstr "Laboratoire National Des Énergies Renouvelables" @@ -1991,6 +2132,9 @@ msgstr "Laboratoire National Des Énergies Renouvelables" msgid "New Analysis" msgstr "Nouvelle analyse" +msgid "New Goal" +msgstr "Nouvel Objectif" + msgid "New Note" msgstr "Nouvelle note" @@ -2056,6 +2200,9 @@ msgstr "Pas nul" msgid "Not all inventory items were successfully deleted" msgstr "Tous les éléments de l'inventaire n'ont pas été supprimés" +msgid "Not seeing your column?" +msgstr "Vous ne voyez pas votre colonne?" + msgid "Note:" msgstr "Remarque:" @@ -2196,6 +2343,9 @@ msgstr "Résultats d'importation de Portfolio Manager" msgid "PM_PROPERTY_ID_MATCHING_CRITERIA_WARNING" msgstr "La suppression de l'ID de propriété PM des critères de correspondance peut entraîner des problèmes inattendus pour les importations de compteurs Portfolio Manager." +msgid "PORTFOLIO_SUMMARY_HEADER_TEXT" +msgstr "La page de résumé du portefeuille compare 2 cycles pour calculer les progrès vers un objectif de réduction de l'intensité de l'utilisation d'énergie. La sélection du cycle et les détails des objectifs peuvent être personnalisés en cliquant sur le bouton Configurer les Objectifs ci-dessous." + msgid "POST_GEOCODING_COUNTS" msgstr "Nombre mis à jour après le géocodage" @@ -2287,6 +2437,15 @@ msgstr "Veuillez patienter pendant que vos données sont chargées ..." msgid "Populate SEED Headers with best known matches" msgstr "Remplissez les en-têtes SEED avec les correspondances les plus connues" +msgid "Portfolio Summary" +msgstr "Résumé du portefeuille" + +msgid "Portfolio Summary will only include properties belonging to this Access Level Instance." +msgstr "Le résumé du portefeuille inclura uniquement les propriétés appartenant à cette instance de niveau d'accès." + +msgid "Portfolio Target" +msgstr "Cible du portefeuille" + msgid "Postal Code" msgstr "Code postal" @@ -2314,6 +2473,9 @@ msgstr "Aperçu Chargement" msgid "Previous" msgstr "Précédente" +msgid "Primary Column" +msgstr "Colonne principale" + msgid "Primary Tax Lot ID" msgstr "ID de lot d'impôt primaire" @@ -2457,6 +2619,9 @@ msgstr "Renommer permet aux utilisateurs de modifier le nom du champ sous-jacent msgid "REVIEW YOUR DATA MAPPINGS" msgstr "EXAMINER VOS MAPPAGES DE DONNÉES" +msgid "REVIEW_MATCHING_CRITERIA" +msgstr "Vérifiez vos critères de correspondance sur la page Paramètres de colonne avant d'importer des données pour la première fois. Vous ne pourrez pas supprimer des champs des critères de correspondance une fois les données ajoutées à votre organisation." + msgid "Read more here." msgstr "Lire la suite ici." @@ -2491,6 +2656,9 @@ msgstr "Lots d'impôt connexes" msgid "Remove" msgstr "Supprimer" +msgid "Remove Access Level" +msgstr "Supprimer le niveau d'accès" + msgid "Remove Column Mappings" msgstr "Supprimer les mappages de colonnes" @@ -2802,6 +2970,9 @@ msgstr "ÉTAPE 1: Mappez vos données" msgid "STEP 2: Review Your Data Mappings" msgstr "ÉTAPE 2: Consultez vos mappages de données" +msgid "SUB_ORG_DEPRECATION" +msgstr "La fonctionnalité Sous-organisation n’est plus recommandée et sera bientôt obsolète. Visitez la page des niveaux d'accès pour définir les niveaux d'accès afin de structurer le contenu de votre organisation." + #, fuzzy msgid "SUGGEST_TO_VERIFY" msgstr "Veuillez vérifier les points suivants avant de continuer." @@ -2863,6 +3034,9 @@ msgstr "Rechercher le nom du champ" msgid "Search table name" msgstr "Rechercher le nom de la table" +msgid "Secondary (optional)" +msgstr "Secondaire (facultatif)" + msgid "Security" msgstr "Sécurité" @@ -2910,6 +3084,12 @@ msgstr "Sélectionnez les colonnes dans les listes ci-dessous pour les faire app msgid "Select one or more filter groups to load your inventory." msgstr "Sélectionnez un ou plusieurs groupes de filtres pour charger votre inventaire." +msgid "Select the Level at which you want to add the new Instance" +msgstr "Sélectionnez le niveau auquel vous souhaitez ajouter la nouvelle instance" + +msgid "Select the new Instance's Parent Access Level Instance" +msgstr "Sélectionnez l'instance de niveau d'accès parent de la nouvelle instance" + msgid "Select the type of file(s) you would like to add to" msgstr "Sélectionnez le type de fichier (s) que vous souhaitez ajouter à" @@ -3038,6 +3218,12 @@ msgstr "Etat (Propriété)" msgid "State (Tax Lot)" msgstr "État (lot d'impôt)" +msgid "Step 1: Add Access Levels" +msgstr "Étape 1: ajouter des niveaux d'accès" + +msgid "Step 2: Upload Access Level Instances" +msgstr "Étape 2: Télécharger les instances de niveau d'accès" + msgid "Sub-Org Name" msgstr "Nom de la sous-organisation" @@ -3104,6 +3290,9 @@ msgstr "Colonne cible" msgid "Target Field" msgstr "Champ cible" +msgid "Target to quantify Portfolio EUI improvement. Must be between 0 and 100." +msgstr "Cible pour quantifier l’amélioration de l’IUE du portefeuille. Doit être compris entre 0 et 100." + msgid "Tax Lot" msgstr "Lot d'impôt" @@ -3154,6 +3343,9 @@ msgstr "Conditions d'utilisation" msgid "Terms of Service as of %(tos.created|date:\"SHORT_DATE_FORMAT\")s" msgstr "Conditions de service à partir de% (tos.created | date: \"SHORT_DATE_FORMAT\") s" +msgid "Tertiary (optional)" +msgstr "Tertiaire (facultatif)" + msgid "Test Connection" msgstr "Tester la Connexion" @@ -3235,7 +3427,7 @@ msgstr "Il y a aussi un lien vers le forum SEED-Platform Users, où vous pouvez msgid "There was an error loading the page" msgstr "Une erreur s'est produite lors du chargement de la page" -msgid "This action replaces any of your current columns with the comma-delmited columns you provided. Would you like to continue?" +msgid "This action replaces any of your current columns with the comma-delimited columns you provided. Would you like to continue?" msgstr "Cette action remplace n'importe laquelle de vos colonnes actuelles par les colonnes délimitées par des virgules que vous avez fournies. Voulez-vous continuer?" msgid "This action updates properties within the selected cycle with data from the Audit Template account associated with this organization. Only Properties with Audit Template Building IDs corresponding to those saved in Audit Template will be updated." @@ -3436,6 +3628,12 @@ msgstr "Mettre à jour Salesforce" msgid "Update UBID" msgstr "Mettre à jour UBID" +msgid "Update the data type of the column to \"Area\" in" +msgstr "Assurez-vous que le type de données de la colonne est bien \"Area\" dans" + +msgid "Update the data type of the column to \"EUI\" in" +msgstr "Assurez-vous que le type de données de la colonne est \"EUI\" dans" + msgid "Update with Audit Template" msgstr "Mise à jour avec Audit Template" @@ -3877,6 +4075,9 @@ msgstr "Prénom" msgid "for your SEED Platform user account" msgstr "pour votre compte utilisateur SEED Platform" +msgid "goal" +msgstr "Objectif" + #: seed/models/models.py:183 msgid "gray" msgstr "gris" diff --git a/requirements/base.txt b/requirements/base.txt index a457d26bde..c779538962 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -79,3 +79,5 @@ django-braces==1.14.0 django-oauth-toolkit==1.2.0 future==0.18.3 + +django-treebeard==4.6.1 diff --git a/seed/analysis_pipelines/better/pipeline.py b/seed/analysis_pipelines/better/pipeline.py index 68cbf0ea5a..d19042de02 100644 --- a/seed/analysis_pipelines/better/pipeline.py +++ b/seed/analysis_pipelines/better/pipeline.py @@ -414,6 +414,11 @@ def _process_results(self, analysis_id): # gather all columns to store BETTER_VALID_MODEL_E_COL = 'better_valid_model_electricity' BETTER_VALID_MODEL_F_COL = 'better_valid_model_fuel' + + # if user is at root level and has role member or owner, columns can be created + # otherwise set the 'missing_columns' flag for later + missing_columns = False + column_data_paths = [ # Combined Savings ExtraDataColumnPath( @@ -523,19 +528,27 @@ def _process_results(self, analysis_id): # check if the column exists with the bare minimum required pieces of data. For example, # don't check column_description and display_name because they may be changed by # the user at a later time. - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name=column_data_path.column_name, - organization=analysis.organization, - table_name='PropertyState', - ) - - # add in the other fields of the columns only if it is a new column. - if created: - column.display_name = column_data_path.column_display_name - column.column_description = column_data_path.column_display_name - - column.save() + # if column doesn't exist, and user has permission to create, then create + try: + Column.objects.get( + is_extra_data=True, + column_name=column_data_path.column_name, + organization=analysis.organization, + table_name='PropertyState', + ) + except Exception: + if analysis.can_create(): + column, created = Column.objects.create( + is_extra_data=True, + column_name=column_data_path.column_name, + organization=analysis.organization, + table_name='PropertyState', + ) + column.display_name = column_data_path.column_display_name + column.column_description = column_data_path.column_display_name + column.save() + else: + missing_columns = True # Update the original PropertyView's PropertyState with analysis results of interest analysis_property_views = analysis.analysispropertyview_set.prefetch_related('property', 'cycle').all() @@ -549,7 +562,7 @@ def _process_results(self, analysis_id): for data_path in column_data_paths: value = get_json_path(data_path.json_path, raw_better_results) if value is not None: - # some of the ee_measures return an empty string, which should be falsey + # some of the ee_measures return an empty string, which should be falsy if 'ee_measures' in data_path.json_path and value == '': value = 0.0 * data_path.unit_multiplier # to be consistent else: @@ -596,9 +609,11 @@ def _process_results(self, analysis_id): else: cleaned_results[col_name] = value - original_property_state = property_view_by_apv_id[analysis_property_view.id].state - original_property_state.extra_data.update(cleaned_results) - original_property_state.save() + # if no columns are missing, save back to property + if not missing_columns: + original_property_state = property_view_by_apv_id[analysis_property_view.id].state + original_property_state.extra_data.update(cleaned_results) + original_property_state.save() @shared_task(bind=True) diff --git a/seed/analysis_pipelines/bsyncr.py b/seed/analysis_pipelines/bsyncr.py index 37965ecbb7..e367ae31d0 100644 --- a/seed/analysis_pipelines/bsyncr.py +++ b/seed/analysis_pipelines/bsyncr.py @@ -323,7 +323,7 @@ def _parse_analysis_property_view_id(filepath): analysis_property_view_id_elem = input_file_tree.xpath(id_xpath, namespaces=NAMESPACES) if len(analysis_property_view_id_elem) != 1: - raise AnalysisPipelineException(f'Expected BuildlingSync file to have exactly one "{PREMISES_ID_NAME}" PremisesIdentifier') + raise AnalysisPipelineException(f'Expected BuildingSync file to have exactly one "{PREMISES_ID_NAME}" PremisesIdentifier') return int(analysis_property_view_id_elem[0].text) diff --git a/seed/analysis_pipelines/co2.py b/seed/analysis_pipelines/co2.py index 4193367357..637b15fca7 100644 --- a/seed/analysis_pipelines/co2.py +++ b/seed/analysis_pipelines/co2.py @@ -350,27 +350,43 @@ def _run_analysis(self, meter_readings_by_analysis_property_view, analysis_id): # displayname and description if the column already exists because # the user might have changed them which would re-create new columns # here. - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_co2', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Average Annual CO2 (kgCO2e)' - column.column_description = 'Average Annual CO2 (kgCO2e)' - column.save() - - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_co2_coverage', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Average Annual CO2 Coverage (% of the year)' - column.column_description = 'Average Annual CO2 Coverage (% of the year)' - column.save() + + # if user is at root level and has role member or owner, columns can be created + # otherwise set the 'missing_columns' flag for later + missing_columns = False + + column_meta = [ + { + 'column_name': 'analysis_co2', + 'display_name': 'Average Annual CO2 (kgCO2e)', + 'description': 'Average Annual CO2 (kgCO2e)' + }, { + 'column_name': 'analysis_co2_coverage', + 'display_name': 'Average Annual CO2 Coverage (% of the year)', + 'description': 'Average Annual CO2 Coverage (% of the year)' + } + ] + + for col in column_meta: + try: + Column.objects.get( + column_name=col["column_name"], + organization=analysis.organization, + table_name='PropertyState', + ) + except Exception: + if analysis.can_create(): + column = Column.objects.create( + is_extra_data=True, + column_name=col["column_name"], + organization=analysis.organization, + table_name='PropertyState', + ) + column.display_name = col["display_name"] + column.column_description = col["description"] + column.save() + else: + missing_columns = True # fix the meter readings dict b/c celery messes with it when serializing meter_readings_by_analysis_property_view = { @@ -431,10 +447,17 @@ def _run_analysis(self, meter_readings_by_analysis_property_view, analysis_id): } analysis_property_view.save() if save_co2_results: - # Convert the analysis results which reports in kgCO2e to MtCO2e which is the canonical database field units - property_view.state.total_ghg_emissions = co2['average_annual_kgco2e'] / 1000 - property_view.state.total_ghg_emissions_intensity = co2['average_annual_kgco2e'] / property_view.state.gross_floor_area.magnitude - property_view.state.save() + # only save to property view if columns exist + if not missing_columns: + # store the extra_data columns from the analysis + property_view.state.extra_data.update({ + 'analysis_co2': co2['average_annual_kgco2e'], + 'analysis_co2_coverage': co2['annual_coverage_percent'] + }) + # Also Convert the analysis results which reports in kgCO2e to MtCO2e which is the canonical database field units + property_view.state.total_ghg_emissions = co2['average_annual_kgco2e'] / 1000 + property_view.state.total_ghg_emissions_intensity = co2['average_annual_kgco2e'] / property_view.state.gross_floor_area.magnitude + property_view.state.save() # all done! pipeline.set_analysis_status_to_completed() diff --git a/seed/analysis_pipelines/eeej.py b/seed/analysis_pipelines/eeej.py index 614375f959..581f7219c1 100644 --- a/seed/analysis_pipelines/eeej.py +++ b/seed/analysis_pipelines/eeej.py @@ -51,29 +51,38 @@ EJSCREEN_URL_STUB = 'https://ejscreen.epa.gov/mapper/EJscreen_SOE_report.aspx?namestr=&geometry={"spatialReference":{"wkid":4326},"x":LONG,"y":LAT}&distance=1&unit=9035&areatype=&areaid=&f=report' -def _get_data_for_census_tract_fetch(property_view_ids, organization): +def _get_data_for_census_tract_fetch(property_view_ids, organization, can_create_columns): """Performs basic validation of the properties for running EEEJ and returns any errors Fetches census tract information based on address if it doesn't exist already :param property_view_ids :param organization + :param can_create_columns - does the user have permission to create columns :returns: dictionary[id:str], dictionary of property_view_ids to error message """ # invalid_location = [] loc_data_by_property_view = {} errors_by_property_view_id = {} - # make sure the Census Tract column exists - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name=TRACT_FIELDNAME, - organization=organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Census Tract' - column.column_description = '2010 Census Tract' - column.save() + # check that Census Tract column exists. If not, create if you can + try: + Column.objects.get( + column_name=TRACT_FIELDNAME, + organization=organization, + table_name='PropertyState', + ) + except Exception: + # does user have permission to create? + if can_create_columns: + column = Column.objects.create( + column_name=TRACT_FIELDNAME, + organization=organization, + table_name='PropertyState', + is_extra_data=True, + ) + column.display_name = 'Census Tract' + column.column_description = '2010 Census Tract' + column.save() property_views = PropertyView.objects.filter(id__in=property_view_ids) for property_view in property_views: @@ -327,8 +336,8 @@ def _prepare_analysis(self, property_view_ids, start_analysis=True): # current implementation will *always* start the analysis immediately analysis = Analysis.objects.get(id=self._analysis_id) - # TODO: check that we have the data we need to retrieve census tract for each property - loc_data_by_property_view, errors_by_property_view_id = _get_data_for_census_tract_fetch(property_view_ids, analysis.organization) + # check that we have the data we need to retrieve census tract for each property + loc_data_by_property_view, errors_by_property_view_id = _get_data_for_census_tract_fetch(property_view_ids, analysis.organization, analysis.can_create()) if not loc_data_by_property_view: AnalysisMessage.log_and_create( @@ -393,76 +402,59 @@ def _run_analysis(self, loc_data_by_analysis_property_view, analysis_id): progress_data = pipeline.set_analysis_status_to_running() progress_data.step('Calculating EEEJ Indicators') analysis = Analysis.objects.get(id=analysis_id) + # if user is at root level and has role member or owner, columns can be created + # otherwise set the 'missing_columns' flag for later + missing_columns = False + + # make sure we have the extra data columns we need + column_meta = [ + { + 'column_name': 'analysis_dac', + 'display_name': 'Disadvantaged Community', + 'description': 'Property located in a Disadvantaged Community as defined by CEJST' + }, { + 'column_name': 'analysis_energy_burden_low_income', + 'display_name': 'Energy Burden and low Income?', + 'description': 'Is this property located in an energy burdened census tract. Energy Burden defined by CEJST as greater than or equal to the 90th percentile for energy burden and is low income.' + }, { + 'column_name': 'analysis_energy_burden_percentile', + 'display_name': 'Energy Burden Percentile', + 'description': 'Energy Burden Percentile as identified by CEJST' + }, { + 'column_name': 'analysis_low_income', + 'display_name': 'Low Income?', + 'description': 'Is this property located in a census tract identified as Low Income by CEJST?' + }, { + 'column_name': 'analysis_share_neighbors_disadvantaged', + 'display_name': 'Share of Neighboring Tracts Identified as Disadvantaged', + 'description': 'The percentage of neighboring census tracts that have been identified as disadvantaged by CEJST' + }, { + 'column_name': 'analysis_number_affordable_housing', + 'display_name': 'Number of Affordable Housing Locations in Tract', + 'description': 'Number of affordable housing locations (both public housing developments and multi-family assisted housing) identified by HUD in census tract' + } + ] - # make sure we have the extra data columns we need, don't set the - # displayname and description if the column already exists because - # the user might have changed them which would re-create new columns - # here. - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_dac', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Disadvantaged Community' - column.column_description = 'Property located in a Disadvantaged Community as defined by CEJST' - column.save() - - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_energy_burden_low_income', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Energy Burden and low Income?' - column.column_description = 'Is this property located in an energy burdened census tract. Energy Burden defined by CEJST as greater than or equal to the 90th percentile for energy burden and is low income.' - column.save() - - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_energy_burden_percentile', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Energy Burden Percentile' - column.column_description = 'Energy Burden Percentile as identified by CEJST' - column.save() - - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_low_income', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Low Income?' - column.column_description = 'Is this property located in a census tract identified as Low Income by CEJST?' - column.save() - - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_share_neighbors_disadvantaged', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Share of Neighboring Tracts Identified as Disadvantaged' - column.column_description = 'The percentage of neighboring census tracts that have been identified as disadvantaged by CEJST' - column.save() - - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_number_affordable_housing', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Number of Affordable Housing Locations in Tract' - column.column_description = 'Number of affordable housing locations (both public housing developments and multi-family assisted housing) identified by HUD in census tract' - column.save() + for col in column_meta: + try: + Column.objects.get( + column_name=col["column_name"], + organization=analysis.organization, + table_name='PropertyState', + ) + except Exception: + if analysis.can_create(): + column = Column.objects.create( + is_extra_data=True, + column_name=col["column_name"], + organization=analysis.organization, + table_name='PropertyState', + ) + column.display_name = col["display_name"] + column.column_description = col["description"] + column.save() + else: + missing_columns = True # fix the dict b/c celery messes with it when serializing analysis_property_view_ids = list(loc_data_by_analysis_property_view.keys()) @@ -505,17 +497,19 @@ def _run_analysis(self, loc_data_by_analysis_property_view, analysis_id): analysis_property_view.save() - # TODO: save each indicators back to property_view + # save each indicators back to property_view + # only if you can property_view = property_views_by_apv_id[analysis_property_view.id] - property_view.state.extra_data.update({ - 'analysis_census_tract': results[analysis_property_view.id]['census_tract'], - 'analysis_dac': results[analysis_property_view.id]['dac'], - 'analysis_energy_burden_low_income': results[analysis_property_view.id]['energy_burden_low_income'], - 'analysis_energy_burden_percentile': results[analysis_property_view.id]['energy_burden_percentile'], - 'analysis_low_income': results[analysis_property_view.id]['low_income'], - 'analysis_share_neighbors_disadvantaged': results[analysis_property_view.id]['share_neighbors_disadvantaged'], - 'analysis_number_affordable_housing': results[analysis_property_view.id]['number_affordable_housing'], - }) + if not missing_columns: + property_view.state.extra_data.update({ + 'analysis_census_tract': results[analysis_property_view.id]['census_tract'], + 'analysis_dac': results[analysis_property_view.id]['dac'], + 'analysis_energy_burden_low_income': results[analysis_property_view.id]['energy_burden_low_income'], + 'analysis_energy_burden_percentile': results[analysis_property_view.id]['energy_burden_percentile'], + 'analysis_low_income': results[analysis_property_view.id]['low_income'], + 'analysis_share_neighbors_disadvantaged': results[analysis_property_view.id]['share_neighbors_disadvantaged'], + 'analysis_number_affordable_housing': results[analysis_property_view.id]['number_affordable_housing'], + }) # store lat/lng (if blank) Census geocoder codes at the street address level (not Point level like mapquest) # store anyway but record as "Census Geocoder (L1AAA)" vs. mapquest "High (P1AAA)" diff --git a/seed/analysis_pipelines/eui.py b/seed/analysis_pipelines/eui.py index 051d779f5b..0bd9be5996 100644 --- a/seed/analysis_pipelines/eui.py +++ b/seed/analysis_pipelines/eui.py @@ -231,27 +231,43 @@ def _run_analysis(self, meter_readings_by_analysis_property_view, analysis_id): # displayname and description if the column already exists because # the user might have changed them which would re-create new columns # here. - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_eui', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'Fractional EUI (kBtu/sqft)' - column.column_description = 'Fractional EUI (kBtu/sqft)' - column.save() - - column, created = Column.objects.get_or_create( - is_extra_data=True, - column_name='analysis_eui_coverage', - organization=analysis.organization, - table_name='PropertyState', - ) - if created: - column.display_name = 'EUI Coverage (% of the year)' - column.column_description = 'EUI Coverage (% of the year)' - column.save() + + # if user is at root level and has role member or owner, columns can be created + # otherwise set the 'missing_columns' flag for later + missing_columns = False + + column_meta = [ + { + 'column_name': 'analysis_eui', + 'display_name': 'Fractional EUI (kBtu/sqft)', + 'description': 'Fractional EUI (kBtu/sqft)' + }, { + 'column_name': 'analysis_eui_coverage', + 'display_name': 'EUI Coverage (% of the year)', + 'description': 'EUI Coverage (% of the year)' + } + ] + + for col in column_meta: + try: + Column.objects.get( + column_name=col["column_name"], + organization=analysis.organization, + table_name='PropertyState', + ) + except Exception: + if analysis.can_create(): + column = Column.objects.create( + is_extra_data=True, + column_name=col["column_name"], + organization=analysis.organization, + table_name='PropertyState', + ) + column.display_name = col["display_name"] + column.column_description = col["description"] + column.save() + else: + missing_columns = True # fix the meter readings dict b/c celery messes with it when serializing meter_readings_by_analysis_property_view = { @@ -281,10 +297,12 @@ def _run_analysis(self, meter_readings_by_analysis_property_view, analysis_id): } analysis_property_view.save() - property_view = property_views_by_apv_id[analysis_property_view.id] - property_view.state.extra_data.update({'analysis_eui': eui['eui']}) - property_view.state.extra_data.update({'analysis_eui_coverage': eui['coverage']}) - property_view.state.save() + # only save to property view if columns exist + if not missing_columns: + property_view = property_views_by_apv_id[analysis_property_view.id] + property_view.state.extra_data.update({'analysis_eui': eui['eui']}) + property_view.state.extra_data.update({'analysis_eui_coverage': eui['coverage']}) + property_view.state.save() # all done! pipeline.set_analysis_status_to_completed() diff --git a/seed/api/v3/urls.py b/seed/api/v3/urls.py index d98b3d6833..e0b0f55270 100644 --- a/seed/api/v3/urls.py +++ b/seed/api/v3/urls.py @@ -9,6 +9,7 @@ from rest_framework_nested import routers as nested_routers from seed.views.main import celery_queue +from seed.views.v3.access_levels import AccessLevelViewSet from seed.views.v3.analyses import AnalysisViewSet from seed.views.v3.analysis_messages import AnalysisMessageViewSet from seed.views.v3.analysis_views import AnalysisPropertyViewViewSet @@ -30,11 +31,14 @@ from seed.views.v3.filter_group import FilterGroupViewSet from seed.views.v3.gbr_properties import GBRPropertyViewSet from seed.views.v3.geocode import GeocodeViewSet +from seed.views.v3.goal_notes import GoalNoteViewSet +from seed.views.v3.goals import GoalViewSet from seed.views.v3.green_assessment_properties import ( GreenAssessmentPropertyViewSet ) from seed.views.v3.green_assessment_urls import GreenAssessmentURLViewSet from seed.views.v3.green_assessments import GreenAssessmentViewSet +from seed.views.v3.historical_notes import HistoricalNoteViewSet from seed.views.v3.import_files import ImportFileViewSet from seed.views.v3.label_inventories import LabelInventoryViewSet from seed.views.v3.labels import LabelViewSet @@ -77,7 +81,8 @@ api_v3_router.register(r'derived_columns', DerivedColumnViewSet, basename='derived_columns') api_v3_router.register(r'eeej', EEEJViewSet, basename='eeej') api_v3_router.register(r'filter_groups', FilterGroupViewSet, basename='filter_groups') -api_v3_router.register(r'gbr_properties', GBRPropertyViewSet, basename='properties') +api_v3_router.register(r'gbr_properties', GBRPropertyViewSet, basename='gbr_properties') +api_v3_router.register(r'goals', GoalViewSet, basename='goals') api_v3_router.register(r'geocode', GeocodeViewSet, basename='geocode') api_v3_router.register(r'green_assessment_properties', GreenAssessmentPropertyViewSet, basename='green_assessment_properties') api_v3_router.register(r'green_assessment_urls', GreenAssessmentURLViewSet, basename='green_assessment_urls') @@ -106,6 +111,7 @@ organizations_router = nested_routers.NestedSimpleRouter(api_v3_router, r'organizations', lookup='organization') organizations_router.register(r'users', OrganizationUserViewSet, basename='organization-users') +organizations_router.register(r'access_levels', AccessLevelViewSet, basename='organization-access_levels') analysis_views_router = nested_routers.NestedSimpleRouter(api_v3_router, r'analyses', lookup='analysis') analysis_views_router.register(r'views', AnalysisPropertyViewViewSet, basename='analysis-views') @@ -121,6 +127,8 @@ properties_router.register(r'notes', NoteViewSet, basename='property-notes') properties_router.register(r'scenarios', PropertyScenarioViewSet, basename='property-scenarios') properties_router.register(r'events', EventViewSet, basename='property-events') +properties_router.register(r'goal_notes', GoalNoteViewSet, basename='property-goal-notes') +properties_router.register(r'historical_notes', HistoricalNoteViewSet, basename='property-historical-notes') # This is a third level router, so we need to register it with the second level router meters_router = nested_routers.NestedSimpleRouter(properties_router, r'meters', lookup='meter') diff --git a/seed/building_sync/building_sync.py b/seed/building_sync/building_sync.py index 5ebe3ccf1f..be1d5b7fc9 100644 --- a/seed/building_sync/building_sync.py +++ b/seed/building_sync/building_sync.py @@ -485,7 +485,7 @@ def _parse_version(self): if not bsync_element.tag.endswith('BuildingSync'): raise ParsingError('Expected BuildingSync element as root element in xml') - # first check for a version attribute in the buldingsync tag + # first check for a version attribute in the buildingsync tag if "version" in bsync_element.attrib: return bsync_element.attrib["version"] diff --git a/seed/building_sync/tests/test_mappings.py b/seed/building_sync/tests/test_mappings.py index f18fc21256..aea71522f4 100644 --- a/seed/building_sync/tests/test_mappings.py +++ b/seed/building_sync/tests/test_mappings.py @@ -230,7 +230,7 @@ def test_update_tree_changes_text_on_existing_element(self): # tree should remain valid as well after inserting self.xmlschema.validate(etree.tostring(self.tree).decode()) - def test_update_tree_changes_text_on_nonexisting_element(self): + def test_update_tree_changes_text_on_nonexistent_element(self): # -- Setup # auc:PremisesName does not exist in the tree xpath = '/'.join([ diff --git a/seed/data_importer/access_level_instances_parser.py b/seed/data_importer/access_level_instances_parser.py new file mode 100644 index 0000000000..b8ccc2fdff --- /dev/null +++ b/seed/data_importer/access_level_instances_parser.py @@ -0,0 +1,61 @@ +# !/usr/bin/env python +# encoding: utf-8 +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" + +from seed.lib.mcm import reader +from seed.lib.superperms.orgs.models import Organization + + +class AccessLevelInstancesParser(object): + """ + This class parses and validates different details about access level instances + Import File - to be created before execution. + + The expected input is a csv/xlsx. The columns headers should be the names of the + access hierarchy levels, omitting the root level since it is the same across all. Example: + + - Level 2 Name : string + - Level 3 Name : string + - ... + """ + + def __init__(self, org_id, access_level_instances_details, num_levels): + # defaulted to None to show it hasn't been cached yet + self.access_level_instances_details = access_level_instances_details + self._org_id = org_id + self.num_levels = num_levels + + @classmethod + def factory(cls, access_level_instances_file, org_id): + """Factory function for accessLevelInstancesParser + + :param access_level_instances_file: File + :param org_id: int + :return: AccessLevelInstancesParser + """ + parser = reader.MCMParser(access_level_instances_file) + raw_data = list(parser.data) + + try: + keys = list(raw_data[0].keys()) + except IndexError: + raise ValueError("File has no rows") + + level_names = keys + # already checked that headers match level names before saving file + # raise ValueError if not + AccessLevelInstancesParser._access_level_names(org_id) + + num_levels = len(level_names) + + return cls(org_id, raw_data, num_levels) + + @classmethod + def _access_level_names(cls, org_id): + access_level_names = [] + if org_id: + access_level_names = Organization.objects.get(pk=org_id).access_level_names + return access_level_names diff --git a/seed/data_importer/match.py b/seed/data_importer/match.py index 7caf5af2c0..adc64aeb79 100644 --- a/seed/data_importer/match.py +++ b/seed/data_importer/match.py @@ -6,7 +6,6 @@ """ import datetime as dt import math -from functools import reduce from celery import shared_task from celery.utils.log import get_task_logger @@ -37,6 +36,9 @@ ) from seed.models.auditlog import AUDIT_IMPORT from seed.utils.match import ( + MultipleALIError, + NoAccessError, + NoViewsError, empty_criteria_filter, match_merge_link, matching_criteria_column_names, @@ -136,22 +138,43 @@ def match_and_link_incoming_properties_and_taxlots_by_cycle(file_pk, progress_ke progress_data.step('Matching data') # Set defaults - property_duplicates_against_existing_count = 0 + # property - within file + property_initial_incoming_count = 0 property_duplicates_within_file_count = 0 - property_merges_against_existing_count = 0 - property_merges_between_existing_count = 0 + property_duplicates_within_file_errors = [] property_merges_within_file_count = 0 - property_new_count = 0 + property_merges_within_file_errors = [] + + # property - within existing records + property_merges_between_existing_count = 0 - tax_lot_duplicates_against_existing_count = 0 + # property - introduce file to existing + property_duplicates_against_existing_count = 0 + merged_property_views = [] + merged_property_state_errors = [] + linked_property_views = [] + linked_property_state_errors = [] + new_property_views = [] + new_property_state_errors = [] + + # taxlot - within file + tax_lot_initial_incoming_count = 0 tax_lot_duplicates_within_file_count = 0 - tax_lot_merges_against_existing_count = 0 - tax_lot_merges_between_existing_count = 0 + tax_lot_duplicates_within_file_errors = [] tax_lot_merges_within_file_count = 0 - tax_lot_new_count = 0 + tax_lot_merges_within_file_errors = [] + + # taxlot - within existing records + taxlot_merges_between_existing_count = 0 - merged_linked_property_views = [] - merged_linked_taxlot_views = [] + # taxlot - introduce file to existing + taxlot_duplicates_against_existing_count = 0 + merged_taxlot_views = [] + merged_taxlot_state_errors = [] + linked_taxlot_views = [] + linked_taxlot_state_errors = [] + new_taxlot_views = [] + new_taxlot_state_errors = [] # Get lists and counts of all the properties and tax lots based on the import file. property_initial_incoming_count = incoming_properties.count() @@ -170,14 +193,14 @@ def match_and_link_incoming_properties_and_taxlots_by_cycle(file_pk, progress_ke if merge_duplicates: promoted_property_ids, property_duplicates_within_file_count = incoming_properties.values_list('id', flat=True), 0 else: - promoted_property_ids, property_duplicates_within_file_count = filter_duplicate_states( + promoted_property_ids, property_duplicates_within_file_errors, property_duplicates_within_file_count = filter_duplicate_states( incoming_properties, sub_progress_key, ) # Within the ImportFile, merge -States together based on user defined matching_criteria log_debug('Start Properties inclusive_match_and_merge') - promoted_property_ids, property_merges_within_file_count = inclusive_match_and_merge( + promoted_property_ids, property_merges_within_file_count, property_merges_within_file_errors = inclusive_match_and_merge( promoted_property_ids, org, PropertyState, @@ -186,9 +209,17 @@ def match_and_link_incoming_properties_and_taxlots_by_cycle(file_pk, progress_ke # Filter Cycle-wide duplicates then merge and/or assign -States to -Views log_debug('Start Properties states_to_views') - merged_property_views, property_duplicates_against_existing_count, property_new_count, property_merges_against_existing_count, property_merges_between_existing_count = states_to_views( + ( + property_merges_between_existing_count, + property_duplicates_against_existing_count, + merged_property_views, + merged_property_state_errors, # TODO: we don't do anything with these. they should probably be deleted. + new_property_views, + errored_new_property_states, + ) = states_to_views( promoted_property_ids, org, + import_file.import_record.access_level_instance, cycle, PropertyState, sub_progress_key, @@ -197,23 +228,38 @@ def match_and_link_incoming_properties_and_taxlots_by_cycle(file_pk, progress_ke # Look for links across Cycles log_debug('Start Properties link_views') - merged_linked_property_views = link_views( + ( + merged_property_views, + # no merged_property_state_errors, they got off the ride before linking + linked_property_views, # note: view that merge _and_ linked are in merged_property_views, not linked_property_views + linked_property_state_errors, + new_property_views, + new_property_state_errors, + ) = link_views_and_states( merged_property_views, + new_property_views, + errored_new_property_states, PropertyView, + cycle, + import_file.import_record.access_level_instance, sub_progress_key, ) + # TODO: the states and Property should probably be deleted too + errored_linked_property_views = PropertyView.objects.filter(state__in=linked_property_state_errors) + errored_linked_property_views.delete() + if incoming_tax_lots.exists(): # Within the ImportFile, filter out the duplicates. log_debug("Start TaxLots filter_duplicate_states") - promoted_tax_lot_ids, tax_lot_duplicates_within_file_count = filter_duplicate_states( + promoted_tax_lot_ids, tax_lot_duplicates_within_file_errors, tax_lot_duplicates_within_file_count = filter_duplicate_states( incoming_tax_lots, sub_progress_key, ) # Within the ImportFile, merge -States together based on user defined matching_criteria log_debug('Start TaxLots inclusive_match_and_merge') - promoted_tax_lot_ids, tax_lot_merges_within_file_count = inclusive_match_and_merge( + promoted_tax_lot_ids, tax_lot_merges_within_file_count, tax_lot_merges_within_file_errors = inclusive_match_and_merge( promoted_tax_lot_ids, org, TaxLotState, @@ -222,9 +268,18 @@ def match_and_link_incoming_properties_and_taxlots_by_cycle(file_pk, progress_ke # Filter Cycle-wide duplicates then merge and/or assign -States to -Views log_debug('Start TaxLots states_to_views') - merged_linked_taxlot_views, tax_lot_duplicates_against_existing_count, tax_lot_new_count, tax_lot_merges_against_existing_count, tax_lot_merges_between_existing_count = states_to_views( + ( + + taxlot_merges_between_existing_count, + taxlot_duplicates_against_existing_count, + merged_taxlot_views, + merged_taxlot_state_errors, # TODO: we don't do anything with these. they should probably be deleted. + new_taxlot_views, + errored_new_taxlot_states, + ) = states_to_views( promoted_tax_lot_ids, org, + import_file.import_record.access_level_instance, cycle, TaxLotState, sub_progress_key, @@ -232,38 +287,114 @@ def match_and_link_incoming_properties_and_taxlots_by_cycle(file_pk, progress_ke # Look for links across Cycles log_debug('Start TaxLots link_views') - merged_linked_taxlot_views = link_views( - merged_linked_taxlot_views, + ( + merged_taxlot_views, + # no merged_taxlot_state_errors, they got off the ride before linking + linked_taxlot_views, # note: view that merge _and_ linked are in merged_taxlot_views, not linked_taxlot_views + linked_taxlot_state_errors, + new_taxlot_views, + new_taxlot_state_errors, + ) = link_views_and_states( + merged_taxlot_views, + new_taxlot_views, + errored_new_taxlot_states, TaxLotView, + cycle, + import_file.import_record.access_level_instance, sub_progress_key, ) + # TODO: the states and taxlot should probably be deleted too + errored_linked_taxlot_views = TaxLotView.objects.filter(state__in=linked_taxlot_state_errors) + errored_linked_taxlot_views.delete() + log_debug('Start pair_new_states') progress_data.step('Pairing data') pair_new_states( - merged_linked_property_views, - merged_linked_taxlot_views, + linked_property_views + new_property_views + merged_property_views, + linked_taxlot_views + new_taxlot_views + merged_taxlot_views, sub_progress_key, ) return { + # property - within file 'property_initial_incoming': property_initial_incoming_count, - 'property_duplicates_against_existing': property_duplicates_against_existing_count, 'property_duplicates_within_file': property_duplicates_within_file_count, - 'property_merges_against_existing': property_merges_against_existing_count, - 'property_merges_between_existing': property_merges_between_existing_count, + 'property_duplicates_within_file_errors': len(property_duplicates_within_file_errors), 'property_merges_within_file': property_merges_within_file_count, - 'property_new': property_new_count, + 'property_merges_within_file_errors': len(property_merges_within_file_errors), + + # property - within existing records + 'property_merges_between_existing': property_merges_between_existing_count, + + # property - introduce file to existing + 'property_duplicates_against_existing': property_duplicates_against_existing_count, + 'property_merges_against_existing': len(merged_property_views), + 'property_merges_against_existing_errors': len(merged_property_state_errors), + 'property_links_against_existing': len(linked_property_views), + 'property_links_against_existing_errors': len(linked_property_state_errors), + 'property_new': len(new_property_views), + 'property_new_errors': len(new_property_state_errors), + + # taxlot - within file 'tax_lot_initial_incoming': tax_lot_initial_incoming_count, - 'tax_lot_duplicates_against_existing': tax_lot_duplicates_against_existing_count, 'tax_lot_duplicates_within_file': tax_lot_duplicates_within_file_count, - 'tax_lot_merges_against_existing': tax_lot_merges_against_existing_count, - 'tax_lot_merges_between_existing': tax_lot_merges_between_existing_count, + 'tax_lot_duplicates_within_file_errors': len(tax_lot_duplicates_within_file_errors), 'tax_lot_merges_within_file': tax_lot_merges_within_file_count, - 'tax_lot_new': tax_lot_new_count, + 'tax_lot_merges_within_file_errors': len(tax_lot_merges_within_file_errors), + + # taxlot - within existing records + 'tax_lot_merges_between_existing': taxlot_merges_between_existing_count, + + # taxlot - introduce file to existing + 'tax_lot_duplicates_against_existing': taxlot_duplicates_against_existing_count, + 'tax_lot_merges_against_existing': len(merged_taxlot_views), + 'tax_lot_merges_against_existing_errors': len(merged_taxlot_state_errors), + 'tax_lot_links_against_existing': len(linked_taxlot_views), + 'tax_lot_links_against_existing_errors': len(linked_taxlot_state_errors), + 'tax_lot_new': len(new_taxlot_views), + 'tax_lot_new_errored': len(new_taxlot_state_errors), } +def link_views_and_states(merged_views, new_views, errored_new_states, ViewClass, cycle, ali, sub_progress_key): + shared_args = [ViewClass, cycle, ali, sub_progress_key] + + # merged_property_views are attached to properties that existed in the db prior to import, so it + # REALLY should not fail. + ( + merged_and_linked_views, + merged_views, + merge_and_linked_states_errors, + _, + ) = link_states([v.state for v in merged_views], *shared_args) + + # new_views may try to link invalidly if the existing records has a different ali. In that case, + # the new record should have never been created. + ( + linked_views_a, + new_views, + linked_state_errors_a, + _, + ) = link_states([v.state for v in new_views], *shared_args) + + # errored_new_states are new states without alis that also didn't merge. If they don't link or + # try to link invalidly, we throw them out. As there are not yet attached to a record, successfully + # not linking is not an option. + ( + linked_views_b, + _, + linked_state_errors_b, + new_state_errors, + ) = link_states(errored_new_states, *shared_args) + + merged_views += merged_and_linked_views + linked_views = linked_views_a + linked_views_b + linked_state_errors = linked_state_errors_a + linked_state_errors_b + + return merged_views, linked_views, linked_state_errors, new_views, new_state_errors + + def filter_duplicate_states(unmatched_states, sub_progress_key): """ Takes a QuerySet of -States and flags then separates exact duplicates. This @@ -278,30 +409,54 @@ def filter_duplicate_states(unmatched_states, sub_progress_key): flag the corresponding -States with DATA_STATE_DELETE. :param unmatched_states: QS - :return: canonical_state_ids, duplicate_count + :return: canonical_state_ids, errors_state_ids, duplicate_count """ sub_progress_data = update_sub_progress_total(4, sub_progress_key) sub_progress_data.step('Matching Data (1/6): Filtering Duplicate States') - ids_grouped_by_hash = unmatched_states.\ + states_grouped_by_hash = unmatched_states.\ values('hash_object').\ - annotate(duplicate_sets=ArrayAgg('id')).\ - values_list('duplicate_sets', flat=True) + annotate(duplicate_sets=ArrayAgg('id'), duplicate_sets_ali=ArrayAgg('raw_access_level_instance_id')) sub_progress_data.step('Matching Data (1/6): Filtering Duplicate States') + + # For group of states with the same ali, find and select the canonical_state # For consistency, take the first member of each of the duplicate sets - canonical_state_ids = [ - ids.pop(ids.index(min(ids))) - for ids - in ids_grouped_by_hash - ] + canonical_state_ids = [] + duplicate_state_ids = [] + errors_state_ids = [] + for states in states_grouped_by_hash: + states = [ + {"id": id, "ali_id": ali_id} for id, ali_id + in zip(states["duplicate_sets"], states["duplicate_sets_ali"]) + ] + states.sort(key=lambda x: x["id"]) + states_with_ali = [s for s in states if s["ali_id"] is not None] + present_ali_ids = set(state["ali_id"] for state in states_with_ali) + + # None have alis, just choose first + if len(present_ali_ids) == 0: + canonical_state = states[0] + + # One ali! choose the first non-null + elif len(present_ali_ids) == 1: + canonical_state = states_with_ali[0] + + # More than one ali was specified! all are of these duplicates are invalid + else: + errors_state_ids += [s["id"] for s in states] + continue + + canonical_state_ids.append(canonical_state["id"]) + states.remove(canonical_state) + duplicate_state_ids += [s["id"] for s in states] + sub_progress_data.step('Matching Data (1/6): Filtering Duplicate States') - duplicate_state_ids = reduce(lambda x, y: x + y, ids_grouped_by_hash) duplicate_count = unmatched_states.filter(pk__in=duplicate_state_ids).update(data_state=DATA_STATE_DELETE) sub_progress_data.step('Matching Data (1/6): Filtering Duplicate States') sub_progress_data.finish_with_success() - return canonical_state_ids, duplicate_count + return canonical_state_ids, errors_state_ids, duplicate_count def inclusive_match_and_merge(unmatched_state_ids, org, StateClass, sub_progress_key): @@ -340,6 +495,7 @@ def inclusive_match_and_merge(unmatched_state_ids, org, StateClass, sub_progress # Collapse groups of matches found in the previous step into 1 -State per group merges_within_file = 0 + errored_states = [] priorities = Column.retrieve_priorities(org) batch_size = math.ceil(len(matched_id_groups) / 100) for idx, ids in enumerate(matched_id_groups): @@ -348,6 +504,11 @@ def inclusive_match_and_merge(unmatched_state_ids, org, StateClass, sub_progress promoted_ids += ids else: states = [s for s in StateClass.objects.filter(pk__in=ids).order_by('-id')] + raw_ali_ids = set(s.raw_access_level_instance for s in states if s.raw_access_level_instance is not None) + if len(raw_ali_ids) > 1: + errored_states += states + continue + merge_state = states.pop() merges_within_file += len(states) @@ -364,10 +525,11 @@ def inclusive_match_and_merge(unmatched_state_ids, org, StateClass, sub_progress # Flag the soon to be promoted ID -States as having gone through matching StateClass.objects.filter(pk__in=promoted_ids).update(data_state=DATA_STATE_MATCHING) - return promoted_ids, merges_within_file + + return promoted_ids, merges_within_file, errored_states -def states_to_views(unmatched_state_ids, org, cycle, StateClass, sub_progress_key, merge_duplicates=False): +def states_to_views(unmatched_state_ids, org, access_level_instance, cycle, StateClass, sub_progress_key, merge_duplicates=False): """ The purpose of this method is to take incoming -States and, apply them to a -View. In the process of doing so, -States could be flagged for "deletion" @@ -480,15 +642,31 @@ def states_to_views(unmatched_state_ids, org, cycle, StateClass, sub_progress_ke # Process -States into -Views either directly (promoted_ids) or post-merge (merge_state_pairs). _log.debug("There are %s merge_state_pairs and %s promote_states" % (len(merge_state_pairs), promote_states.count())) priorities = Column.retrieve_priorities(org.pk) - processed_views = [] - promoted_ids = [] - merged_state_ids = [] try: with transaction.atomic(): + # For each merge_state_pairs, try to merge the new state into the existing property views + merged_views = [] + merged_state_ids = [] + errored_merged_states = [] batch_size = math.ceil(len(merge_state_pairs) / 100) for idx, state_pair in enumerate(merge_state_pairs): existing_state, newer_state = state_pair existing_view = ViewClass.objects.get(state_id=existing_state.id) + existing_obj = getattr(existing_view, "property" if table_name == 'PropertyState' else "taxlot") + + # ensure that new ali and existing ali match and that we have access to existing ali. + new_ali = newer_state.raw_access_level_instance + if new_ali is None: + if not ( + existing_obj.access_level_instance == access_level_instance or + existing_obj.access_level_instance.is_descendant_of(access_level_instance) + ): + errored_merged_states.append(newer_state) + continue + else: + if existing_obj.access_level_instance != new_ali: + errored_merged_states.append(newer_state) + continue # Merge -States and assign new/merged -State to existing -View merged_state = save_state_match(existing_state, newer_state, priorities) @@ -496,18 +674,25 @@ def states_to_views(unmatched_state_ids, org, cycle, StateClass, sub_progress_ke existing_view.state = merged_state existing_view.save() - processed_views.append(existing_view) + merged_views.append(existing_view) merged_state_ids.append(merged_state.id) if batch_size > 0 and idx % batch_size == 0: sub_progress_data.step('Matching Data (4/6): Merging State Pairs') sub_progress_data = update_sub_progress_total(100, sub_progress_key, finish=True) + # For each state that doesn't merge into an existing property, promote it, creating a new property + new_views = [] + promoted_state_ids = [] + errored_new_states = [] batch_size = math.ceil(len(promote_states) / 100) for idx, state in enumerate(promote_states): - promoted_ids.append(state.id) created_view = state.promote(cycle) - processed_views.append(created_view) + if created_view is None: + errored_new_states.append(state) + else: + promoted_state_ids.append(state.id) + new_views.append(created_view) if batch_size > 0 and idx % batch_size == 0: sub_progress_data.step('Matching Data (5/6): Promoting States') sub_progress_data.finish_with_success() @@ -515,22 +700,28 @@ def states_to_views(unmatched_state_ids, org, cycle, StateClass, sub_progress_ke except IntegrityError as e: raise IntegrityError("Could not merge results with error: %s" % (e)) - new_count = len(promoted_ids) # update merge_state while excluding any states that were a product of a previous, file-inclusive merge - StateClass.objects.filter(pk__in=promoted_ids).exclude(merge_state=MERGE_STATE_MERGED).update( + StateClass.objects.filter(pk__in=promoted_state_ids).exclude(merge_state=MERGE_STATE_MERGED).update( merge_state=MERGE_STATE_NEW ) - matched_count = StateClass.objects.filter(pk__in=merged_state_ids).update( + StateClass.objects.filter(pk__in=merged_state_ids).update( data_state=DATA_STATE_MATCHING, merge_state=MERGE_STATE_MERGED ) - return list(set(processed_views)), duplicate_count, new_count, matched_count, merged_between_existing_count + return ( + merged_between_existing_count, + duplicate_count, + list(set(merged_views)), # so no dupes, I think? + errored_merged_states, + new_views, + errored_new_states, + ) -def link_views(merged_views, ViewClass, sub_progress_key): +def link_states(states, ViewClass, cycle, highest_ali, sub_progress_key): """ - Run each of the given -Views through a linking round. + Run each of the given -States through a linking round. For details on the actual linking logic, please refer to the the match_merge_link() method. @@ -543,21 +734,34 @@ def link_views(merged_views, ViewClass, sub_progress_key): else: state_class_name = "TaxLotState" - processed_views = [] - - batch_size = math.ceil(len(merged_views) / 100) - for idx, view in enumerate(merged_views): - _merge_count, _link_count, view_id = match_merge_link(view.id, state_class_name) - - if view_id is not None: - processed_views.append(ViewClass.objects.get(pk=view_id)) + linked_views = [] + unlinked_views = [] + invalid_link_states = [] + unlinked_states = [] + + batch_size = math.ceil(len(states) / 100) + for idx, state in enumerate(states): + try: + _merge_count, _link_count, view_id = match_merge_link(state.id, state_class_name, highest_ali=highest_ali, cycle=cycle) + except (MultipleALIError, NoAccessError): + invalid_link_states.append(state.id) + continue + except NoViewsError: + unlinked_states.append(state.id) + continue + + view = ViewClass.objects.get(pk=view_id) + if _link_count == 0: + unlinked_views.append(view) else: - processed_views.append(view) + linked_views.append(view) + if batch_size > 0 and idx % batch_size == 0: sub_progress_data.step('Matching Data (6/6): Merging Views') + sub_progress_data.finish_with_success() - return processed_views + return linked_views, unlinked_views, invalid_link_states, unlinked_states def save_state_match(state1, state2, priorities): diff --git a/seed/data_importer/migrations/0019_accountability_hierarchy.py b/seed/data_importer/migrations/0019_accountability_hierarchy.py new file mode 100644 index 0000000000..33813ccae7 --- /dev/null +++ b/seed/data_importer/migrations/0019_accountability_hierarchy.py @@ -0,0 +1,41 @@ +# Generated by Django 3.2.23 on 2024-03-08 06:05 + +import django.db.models.deletion +from django.db import migrations, models, transaction + + +@transaction.atomic +def set_import_records_ali(apps, schema_editor): + ImportRecord = apps.get_model('data_importer', 'ImportRecord') + AccessLevelInstance = apps.get_model('orgs', 'AccessLevelInstance') + + if ImportRecord.objects.filter(super_organization=None).exists(): + raise ValueError("Some ImportRecords have no super_organization, and are orphaned. This shouldn't have happened and these ImportRecords cannot be migrated. Please add a super_organization or delete the orphaned ImportRecords and try again.") + + root_alis = {ali.organization_id: ali for ali in AccessLevelInstance.objects.filter(depth=1)} + + for import_record in ImportRecord.objects.all().iterator(): + import_record.access_level_instance = root_alis[import_record.super_organization_id] + import_record.save(update_fields=['access_level_instance']) + + +class Migration(migrations.Migration): + + dependencies = [ + ('orgs', '0030_accountability_hierarchy'), + ('data_importer', '0018_importfile_multiple_cycle_upload'), + ] + + operations = [ + migrations.AddField( + model_name='importrecord', + name='access_level_instance', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='import_record', to='orgs.accesslevelinstance'), + ), + migrations.RunPython(set_import_records_ali, reverse_code=migrations.RunPython.noop), + migrations.AlterField( + model_name='importrecord', + name='access_level_instance', + field=models.ForeignKey(null=False, on_delete=django.db.models.deletion.CASCADE, related_name='import_record', to='orgs.accesslevelinstance'), + ), + ] diff --git a/seed/data_importer/models.py b/seed/data_importer/models.py index 9e5584b9e4..4d0ea9d1b3 100644 --- a/seed/data_importer/models.py +++ b/seed/data_importer/models.py @@ -20,6 +20,7 @@ from config.utils import de_camel_case from seed.data_importer.managers import NotDeletedManager from seed.lib.mcm.reader import ROW_DELIMITER +from seed.lib.superperms.orgs.models import AccessLevelInstance from seed.lib.superperms.orgs.models import Organization as SuperOrganization from seed.utils.cache import ( delete_cache, @@ -92,6 +93,7 @@ class ImportRecord(NotDeletableModel): help_text='The application (e.g., BPD or SEED) for this dataset', default='seed') owner = models.ForeignKey('landing.SEEDUser', on_delete=models.CASCADE, blank=True, null=True) + access_level_instance = models.ForeignKey(AccessLevelInstance, on_delete=models.CASCADE, null=False, related_name="import_record") start_time = models.DateTimeField(blank=True, null=True) finish_time = models.DateTimeField(blank=True, null=True) created_at = models.DateTimeField(blank=True, null=True) @@ -596,6 +598,10 @@ def __del__(self): def from_portfolio_manager(self): return self._strcmp(self.source_program, 'PortfolioManager') + @property + def access_level_instance(self): + return self.import_record.access_level_instance + @property def from_buildingsync(self): source_type = self.source_type if self.source_type else '' diff --git a/seed/data_importer/tasks.py b/seed/data_importer/tasks.py index f75a9c603b..a6796d8ba8 100644 --- a/seed/data_importer/tasks.py +++ b/seed/data_importer/tasks.py @@ -12,6 +12,7 @@ import json import os import tempfile +import time import traceback import zipfile from bisect import bisect_left @@ -27,8 +28,10 @@ from celery.utils.log import get_task_logger from dateutil import parser from django.contrib.gis.geos import GEOSGeometry +from django.core.exceptions import ObjectDoesNotExist from django.core.files.uploadedfile import SimpleUploadedFile from django.db import DataError, IntegrityError, connection, transaction +from django.db.models import Q from django.db.utils import ProgrammingError from django.utils import timezone as tz from django.utils.timezone import make_naive @@ -36,6 +39,9 @@ from seed.building_sync import validation_client from seed.building_sync.building_sync import BuildingSync +from seed.data_importer.access_level_instances_parser import ( + AccessLevelInstancesParser +) from seed.data_importer.equivalence_partitioner import EquivalencePartitioner from seed.data_importer.match import ( match_and_link_incoming_properties_and_taxlots @@ -53,7 +59,7 @@ from seed.lib.mcm.mapper import expand_rows from seed.lib.mcm.utils import batch from seed.lib.progress_data.progress_data import ProgressData -from seed.lib.superperms.orgs.models import Organization +from seed.lib.superperms.orgs.models import AccessLevelInstance, Organization from seed.lib.xml_mapping import reader as xml_reader from seed.models import ( ASSESSED_BS, @@ -393,6 +399,9 @@ def map_row_chunk(ids, file_pk, source_type, prog_key, **kwargs): map_model_obj.import_file = import_file map_model_obj.source_type = save_type map_model_obj.organization = import_file.import_record.super_organization + # _process_ali_data(map_model_obj, import_file.access_level_instance) + _process_ali_data(map_model_obj, row, import_file.access_level_instance, table_mappings.get("")) + if hasattr(map_model_obj, 'data_state'): map_model_obj.data_state = DATA_STATE_MAPPING if hasattr(map_model_obj, 'clean'): @@ -493,6 +502,59 @@ def map_row_chunk(ids, file_pk, source_type, prog_key, **kwargs): return True +def _process_ali_data(model, raw_data, import_file_ali, ah_mappings): + org_alns = model.organization.access_level_names + + # if org only has root, just assign it to root, they won't have any ali info + if AccessLevelInstance.objects.filter(organization=model.organization).count() == 1: + model.raw_access_level_instance = model.organization.root + return + + # if not mappings + if not ah_mappings: + model.raw_access_level_instance_error = "Missing Access Level mappings." + return + + # clean ali_info + ali_info = { + to_col: raw_data.get(from_col) + for from_col, (_, to_col, _, _) in ah_mappings.items() + if raw_data.get(from_col) is not None and raw_data.get(from_col) != "" + } + if not ali_info: + model.raw_access_level_instance_error = "Missing Access Level Column data." + return + + # ensure we have a valid set of keys, else error out + needed_keys = set(org_alns[:len(ali_info)]) + if needed_keys != ali_info.keys(): + model.raw_access_level_instance_error = "Missing/Incomplete Access Level Column." + return + + # try to get ali matching ali info within subtree + paths_match = Q(path=ali_info) + in_subtree = Q(lft__gte=import_file_ali.lft, rgt__lte=import_file_ali.rgt) + ali = AccessLevelInstance.objects.filter(organization=model.organization).filter(Q(paths_match & in_subtree)).first() + + # if ali is None, we error + if ali is None: + is_ancestor = Q(lft__lt=import_file_ali.lft, rgt__gt=import_file_ali.rgt) + ancestor_ali = AccessLevelInstance.objects.filter(organization=model.organization).filter(Q(is_ancestor & paths_match)).first() + + # differing errors if + # 1. the user can see the ali but cannot access, or + # 2. the ali cannot be seen by the user and/or doesn't exist. + if ancestor_ali is not None: + model.raw_access_level_instance_error = "Access Level Instance cannot be accessed with the permissions of this import file." + else: + model.raw_access_level_instance_error = "Access Level Information does not match any existing Access Level Instance." + + return + + # success! + model.raw_access_level_instance = ali + + def _store_raw_footprint_and_create_rule(footprint_details, table, org, import_file, original_row, map_model_obj): column_name = footprint_details['raw_field'] + ' (Invalid Footprint)' @@ -811,6 +873,22 @@ def finish_raw_save(results, file_pk, progress_key): return finished_progress_data +@shared_task(ignore_result=True) +def finish_raw_ali_save(results, progress_key): + """ + Finish importing the raw Access Level Instances file. + + :param results: List of results from the parent task + :param filename: filename that was being imported + :param progress_key: string, Progress Key to append progress + :param summary: Summary to be saved on ProgressData as a message + :return: results: results from the other tasks before the chord ran + """ + progress_data = ProgressData.from_key(progress_key) + + return progress_data.finish_with_success(results) + + def cache_first_rows(import_file, parser): """Cache headers, and rows 2-6 for validation/viewing. @@ -1008,6 +1086,103 @@ def _save_sensor_readings_task(readings_tuples, data_logger_id, sensor_column_na return result +@shared_task +def _save_access_level_instances_task(rows, org_id, progress_key): + progress_data = ProgressData.from_key(progress_key) + result = {} + + # get org + try: + org = Organization.objects.get(pk=org_id) + except ObjectDoesNotExist: + raise 'Could not retrieve organization at pk = ' + str(org_id) + + # get access level names (array of ordered names) + access_level_names = AccessLevelInstancesParser._access_level_names(org_id) + access_level_names = [x.lower() for x in access_level_names] + # determine whether root level was provided in file (if not, remove from list) + has_root = True + if rows: + headers = [x.lower() for x in rows[0].keys()] + + if access_level_names[0] not in headers: + access_level_names.pop(0) + has_root = False + # saves the non-existent instances + for row in rows: + message = None + # process in order of access_level_names + # create the needed instances along the way + current_level = None + children = [org.root] + if not has_root: + children = org.root.get_children() + current_level = org.root + # lowercase keys just in case + row = {k.lower(): v for k, v in row.items()} + + for key, val in row.items(): + # check headers + if key not in access_level_names: + message = f"Error reading CSV data row: {row}...no access level for column {key} found" + break + # check for empty value (don't add blanks) + if not val: + message = f"Blank value for column {key} in CSV data row: {row}...skipping" + break + + # does this level exist already? + looking_for = val + + found = False + for child in children: + if child.name == looking_for: + found = True + current_level = child + children = current_level.get_children() + break + + if not found: + if not current_level: + # this would mean they are trying to add ROOT and that can't be + message = f"Error attempting to add '{val}' as another root element. Root element already defined as: {org.root.name}" + break + # add it + try: + current_level = org.add_new_access_level_instance(current_level.id, looking_for) + current_level.refresh_from_db() + # get its children (should be empty) + children = current_level.get_children() + except Exception as e: + message = f"Error has occurred when adding element '{val}' for entry: {row}: {e}" + break + + # add a row but only for errors + if message: + result[row[access_level_names[-1]]] = {'message': message} + + progress_data.step() + + return result + + +@shared_task +def _save_access_level_instances_data_create_tasks(filename, org_id, progress_key): + progress_data = ProgressData.from_key(progress_key) + + # open and read in file + parser = AccessLevelInstancesParser.factory( + open(filename, 'r'), + org_id + ) + access_level_instances_data = parser.access_level_instances_details + + progress_data.total = len(access_level_instances_data) + progress_data.save() + results = _save_access_level_instances_task(access_level_instances_data, org_id, progress_data.key) + return finish_raw_ali_save(results, progress_data.key) + + @shared_task def _save_greenbutton_data_task(readings, meter_id, meter_usage_point_id, progress_key): """ @@ -1305,6 +1480,23 @@ def _save_raw_data_create_tasks(file_pk, progress_key): return chord(tasks, interval=15)(finish_raw_save.s(file_pk, progress_data.key)) +def save_raw_access_level_instances_data(filename, org_id): + """ save data and keep progress """ + progress_data = ProgressData(func_name='save_raw_access_level_instances_data', unique_id=int(time.time())) + try: + # queue up the tasks and immediately return. This is needed in the case of large hierarchy files + # causing the website to timeout due to inactivity. + _save_access_level_instances_data_create_tasks.s(filename, org_id, progress_data.key).delay() + except StopIteration: + progress_data.finish_with_error('StopIteration Exception', traceback.format_exc()) + except KeyError as e: + progress_data.finish_with_error('Invalid Column Name: "' + str(e) + '"', traceback.format_exc()) + except Exception as e: + progress_data.finish_with_error('Unhandled Error: ' + str(e), traceback.format_exc()) + + return progress_data.result() + + def save_raw_espm_data_synchronous(file_pk: int) -> dict: """This method is a one-off method for saving ESPM the raw data synchronously. This is needed for the ESPM update method that runs on a single property. The `save_raw_data` diff --git a/seed/data_importer/tests/integration/test_data_import.py b/seed/data_importer/tests/integration/test_data_import.py index e211765ae7..e0448f2824 100644 --- a/seed/data_importer/tests/integration/test_data_import.py +++ b/seed/data_importer/tests/integration/test_data_import.py @@ -104,7 +104,7 @@ def test_map_data(self): """Save mappings based on user specifications.""" # Create new import file to test import_record = ImportRecord.objects.create( - owner=self.user, last_modified_by=self.user, super_organization=self.org + owner=self.user, last_modified_by=self.user, super_organization=self.org, access_level_instance=self.org.root ) import_file = ImportFile.objects.create( import_record=import_record, @@ -515,7 +515,9 @@ def test_promote_properties(self): # Promote the PropertyState to a PropertyView pv1 = ps.promote(self.cycle) + ps.raw_access_level_instance = self.org.root # un-clear it pv2 = ps.promote(self.cycle) # should just return the same object + ps.raw_access_level_instance = self.org.root # un-clear it self.assertEqual(pv1, pv2) # promote the same state for a new cycle, same data @@ -528,7 +530,7 @@ def test_promote_properties(self): # For some reason if you comment out the next two test cases (TestMappingPropertiesOnly and # TestMappingTaxLotsOnly), the test_views_matching.py file will fail. I cannot figure out -# what is causing this and it is really annoying. Inherenting from DataMappingBaseTestCase +# what is causing this and it is really annoying. Inheriting from DataMappingBaseTestCase # will delete all the model data upon completion, Maybe because FAKE_MAPPINGS # is not a copy, rather a pointer? diff --git a/seed/data_importer/tests/integration/test_demo_v2.py b/seed/data_importer/tests/integration/test_demo_v2.py index 44c12ca405..716b6c9839 100644 --- a/seed/data_importer/tests/integration/test_demo_v2.py +++ b/seed/data_importer/tests/integration/test_demo_v2.py @@ -54,13 +54,13 @@ def set_up(self, import_file_source_type): ) import_record_1 = ImportRecord.objects.create( - owner=user, last_modified_by=user, super_organization=org + owner=user, last_modified_by=user, super_organization=org, access_level_instance=org.root ) import_file_1 = ImportFile.objects.create(import_record=import_record_1, cycle=cycle) import_record_2 = ImportRecord.objects.create( - owner=user, last_modified_by=user, super_organization=org + owner=user, last_modified_by=user, super_organization=org, access_level_instance=org.root ) import_file_2 = ImportFile.objects.create(import_record=import_record_2, cycle=cycle) diff --git a/seed/data_importer/tests/integration/test_equivalence_partioner_with_file.py b/seed/data_importer/tests/integration/test_equivalence_partioner_with_file.py index 5b5ed6a2ab..d27407dbd7 100644 --- a/seed/data_importer/tests/integration/test_equivalence_partioner_with_file.py +++ b/seed/data_importer/tests/integration/test_equivalence_partioner_with_file.py @@ -44,7 +44,7 @@ def test_equivalence(self): all_unmatched_properties = self.import_file.find_unmatched_property_states() sub_progress_data = ProgressData(func_name='match_sub_progress', unique_id=123) sub_progress_data.save() - unmatched_property_ids, duplicate_property_count = match.filter_duplicate_states( + unmatched_property_ids, _, duplicate_property_count = match.filter_duplicate_states( all_unmatched_properties, sub_progress_data.key, ) diff --git a/seed/data_importer/tests/integration/test_footprints_import.py b/seed/data_importer/tests/integration/test_footprints_import.py index 56a0ff7a98..1a9585f779 100644 --- a/seed/data_importer/tests/integration/test_footprints_import.py +++ b/seed/data_importer/tests/integration/test_footprints_import.py @@ -56,13 +56,13 @@ def set_up(self, import_file_source_type): ) import_record_1 = ImportRecord.objects.create( - owner=user, last_modified_by=user, super_organization=org + owner=user, last_modified_by=user, super_organization=org, access_level_instance=org.root ) import_file_1 = ImportFile.objects.create(import_record=import_record_1, cycle=cycle) import_record_2 = ImportRecord.objects.create( - owner=user, last_modified_by=user, super_organization=org + owner=user, last_modified_by=user, super_organization=org, access_level_instance=org.root ) import_file_2 = ImportFile.objects.create(import_record=import_record_2, cycle=cycle) diff --git a/seed/data_importer/tests/integration/test_merge_duplicate_rows.py b/seed/data_importer/tests/integration/test_merge_duplicate_rows.py index 5d38fc5a70..3d4b998063 100644 --- a/seed/data_importer/tests/integration/test_merge_duplicate_rows.py +++ b/seed/data_importer/tests/integration/test_merge_duplicate_rows.py @@ -204,7 +204,7 @@ def test_import_duplicates(self): sub_progress_data = ProgressData(func_name='match_sub_progress', unique_id=123) sub_progress_data.save() - unique_property_states, _ = match.filter_duplicate_states(ps, sub_progress_data.key) + unique_property_states, _, _ = match.filter_duplicate_states(ps, sub_progress_data.key) self.assertEqual(len(unique_property_states), 4) tasks.geocode_and_match_buildings_task(self.import_file.id) diff --git a/seed/data_importer/tests/test_AH_import.py b/seed/data_importer/tests/test_AH_import.py new file mode 100644 index 0000000000..0f529451ca --- /dev/null +++ b/seed/data_importer/tests/test_AH_import.py @@ -0,0 +1,951 @@ +# !/usr/bin/env python +# encoding: utf-8 +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" + + +from datetime import datetime + +from seed.data_importer.match import ( + match_and_link_incoming_properties_and_taxlots +) +from seed.lib.progress_data.progress_data import ProgressData +from seed.models import ( + ASSESSED_RAW, + DATA_STATE_MAPPING, + DATA_STATE_MATCHING, + Property, + PropertyState, + PropertyView +) +from seed.test_helpers.fake import ( + FakeCycleFactory, + FakePropertyFactory, + FakePropertyStateFactory, + FakePropertyViewFactory +) +from seed.tests.util import DataMappingBaseTestCase + + +class TestAHImportFile(DataMappingBaseTestCase): + def setUp(self): + selfvars = self.set_up(ASSESSED_RAW) + self.user, self.org, self.import_file, self.import_record, self.cycle = selfvars + self.import_file.mapping_done = True + self.import_file.save() + self.cycle_factory = FakeCycleFactory(organization=self.org, user=self.user) + + # create tree + self.org.access_level_names = ["1st Gen", "2nd Gen", "3rd Gen"] + mom = self.org.add_new_access_level_instance(self.org.root.id, "mom") + self.me_ali = self.org.add_new_access_level_instance(mom.id, "me") + self.sister = self.org.add_new_access_level_instance(mom.id, "sister") + self.org.save() + + self.property_state_factory = FakePropertyStateFactory(organization=self.org) + self.property_factory = FakePropertyFactory(organization=self.org) + + self.base_details = { + 'import_file_id': self.import_file.id, + 'data_state': DATA_STATE_MAPPING, + } + + progress_data = ProgressData(func_name='match_buildings', unique_id=self.import_file) + sub_progress_data = ProgressData(func_name='match_sub_progress', unique_id=self.import_file) + self.action_args = [self.import_file.id, progress_data.key, sub_progress_data.key] + + self.blank_result = { + 'import_file_records': None, + 'property_initial_incoming': 0, + 'property_duplicates_against_existing': 0, + 'property_duplicates_within_file': 0, + 'property_duplicates_within_file_errors': 0, + 'property_merges_against_existing': 0, + 'property_merges_against_existing_errors': 0, + 'property_merges_between_existing': 0, + 'property_merges_within_file': 0, + 'property_merges_within_file_errors': 0, + 'property_new': 0, + 'property_new_errors': 0, + 'tax_lot_initial_incoming': 0, + 'tax_lot_duplicates_against_existing': 0, + 'tax_lot_duplicates_within_file': 0, + 'tax_lot_duplicates_within_file_errors': 0, + 'tax_lot_merges_against_existing': 0, + 'tax_lot_merges_against_existing_errors': 0, + 'tax_lot_merges_between_existing': 0, + 'tax_lot_merges_within_file': 0, + 'tax_lot_merges_within_file_errors': 0, + 'tax_lot_new': 0, + 'tax_lot_new_errored': 0, + } + + +class TestAHImport(TestAHImportFile): + def test_AH_set(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_new'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # Assert - Property was created with correct ali + assert Property.objects.count() == 1 + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + + def test_no_AH(self): + # Set Up + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_new_errors'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # Assert - No property was created + assert Property.objects.count() == 0 + assert PropertyState.objects.count() == 1 + + +class TestAHImportDuplicateIncoming(TestAHImportFile): + def setUp(self): + super().setUp() + + # this causes all the states to be duplicates + self.base_details["ubid"] = '86HJPCWQ+2VV-1-3-2-3' + self.base_details["no_default_data"] = False + + def test_duplicate_both_good(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_duplicates_within_file'] = 1 + self.blank_result['property_new'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # Assert - 1 Property, 1 PropertyViews, 2 PropertyStates + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + assert PropertyState.objects.count() == 2 + + def test_duplicate_both_good_but_different_a(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.org.root.id + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_duplicates_within_file_errors'] = 2 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # Assert - No properties created + self.assertEqual(Property.objects.count(), 0) + self.assertEqual(PropertyState.objects.count(), 2) + + def test_duplicate_both_good_but_different_b(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_id"] = self.org.root.id + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_duplicates_within_file_errors'] = 2 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # 1 Property, 1 PropertyViews, 2 PropertyStates + self.assertEqual(Property.objects.count(), 0) + self.assertEqual(PropertyState.objects.count(), 2) + + def test_duplicate_one_bad_a(self): + # Set Up + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_error"] = None + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_duplicates_within_file'] = 1 + self.blank_result['property_new'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # 1 Property, 1 PropertyViews, 2 PropertyStates + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + assert PropertyState.objects.count() == 2 + + def test_duplicate_one_bad_b(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.base_details["raw_access_level_instance_id"] = None + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_duplicates_within_file'] = 1 + self.blank_result['property_new'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # 1 Property, 1 PropertyViews, 2 PropertyStates + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + assert PropertyState.objects.count() == 2 + + def test_duplicate_both_bad(self): + # Set Up + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.property_state_factory.get_property_state(**self.base_details) + + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_duplicates_within_file'] = 1 + self.blank_result['property_new_errors'] = 1 # cause it doesnt have an ali + self.assertDictContainsSubset(self.blank_result, results) + + # 0 Property, 0 PropertyViews, 0 PropertyStates + self.assertEqual(Property.objects.count(), 0) + self.assertEqual(PropertyState.objects.count(), 2) + + +class TestAHImportMatchIncoming(TestAHImportFile): + def setUp(self): + super().setUp() + + # this causes all the states to match + self.base_details["ubid"] = '86HJPCWQ+2VV-1-3-2-3' + self.base_details["no_default_data"] = False + + def test_match_both_good(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_merges_within_file'] = 1 + self.blank_result['property_new'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # 1 Property, 1 PropertyView, 3 PropertyStates (2 imported, 1 merge result) + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + assert PropertyState.objects.count() == 3 + + def test_match_both_good_but_different_a(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.org.root.id + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_merges_within_file_errors'] = 2 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # No Property and states deleted + self.assertEqual(Property.objects.count(), 0) + self.assertEqual(PropertyState.objects.count(), 2) + + def test_match_both_good_but_different_b(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_id"] = self.org.root.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_merges_within_file_errors'] = 2 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # No Property and states deleted + self.assertEqual(Property.objects.count(), 0) + self.assertEqual(PropertyState.objects.count(), 2) + + def test_match_one_bad_a(self): + # Set Up + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_error"] = None + self.base_details["raw_access_level_instance_id"] = self.org.root.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_merges_within_file'] = 1 + self.blank_result['property_new'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # 1 Property, 1 PropertyView, 3 PropertyStates (2 imported, 1 merge result) + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.org.root + assert PropertyState.objects.count() == 3 + + def test_match_one_bad_b(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.base_details["raw_access_level_instance_id"] = None + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_merges_within_file'] = 1 + self.blank_result['property_new'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # 1 Property, 1 PropertyView, 3 PropertyStates (2 imported, 1 merge result) + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + assert PropertyState.objects.count() == 3 + + def test_match_both_bad(self): + # Set Up + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.property_state_factory.get_property_state(**self.base_details) + + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 2 + self.blank_result['property_merges_within_file'] = 1 + self.blank_result['property_new_errors'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # No Property created and both states deleted + self.assertEqual(Property.objects.count(), 0) + self.assertEqual(PropertyState.objects.count(), 3) + + +class TestAHImportDuplicateExisting(TestAHImportFile): + def setUp(self): + super().setUp() + + # this causes all the states to be duplicates + self.base_details["no_default_data"] = False + + self.state = self.property_state_factory.get_property_state(**self.base_details) + self.state.import_file = None + self.state.save() + self.existing_property = self.property_factory.get_property(access_level_instance=self.me_ali) + self.view = PropertyView.objects.create(property=self.existing_property, cycle=self.cycle, state=self.state) + + def test_duplicate_both_good(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_duplicates_against_existing'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # 1 Property, 1 PropertyViews, 2 PropertyStates + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + assert PropertyState.objects.count() == 2 + + def test_duplicate_both_good_but_different(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.org.root.id + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_duplicates_against_existing'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # No Property and states deleted + self.assertEqual(Property.objects.count(), 1) + self.assertEqual(PropertyState.objects.count(), 2) + + def test_duplicate_both_good_but_no_access_to_existing(self): + # Set Up + self.existing_property.access_level_instance = self.sister + self.existing_property.save() + self.import_record.access_level_instance = self.me_ali + self.import_record.save() + + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_duplicates_against_existing'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # Only one Property + self.assertEqual(Property.objects.count(), 1) + + # unmerged + self.assertEqual(PropertyState.objects.count(), 2) + + # city unchanged + assert PropertyView.objects.count() == 1 + pv = PropertyView.objects.first() + assert pv.state.city is None + + def test_duplicate_incoming_error(self): + # Set Up + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_duplicates_against_existing'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # 1 Property, 1 PropertyViews, 2 PropertyStates + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + assert PropertyState.objects.count() == 2 + + def test_duplicate_incoming_error_and_no_access_to_existing(self): + # Set Up + self.existing_property.access_level_instance = self.sister + self.existing_property.save() + self.import_record.access_level_instance = self.me_ali + self.import_record.save() + + self.base_details["raw_access_level_instance_id"] = None + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_duplicates_against_existing'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # Only one Property + self.assertEqual(Property.objects.count(), 1) + + # unmerged + self.assertEqual(PropertyState.objects.count(), 2) + + # city unchanged + assert PropertyView.objects.count() == 1 + pv = PropertyView.objects.first() + assert pv.state.city is None + + +class TestAHImportMatchExisting(TestAHImportFile): + def setUp(self): + super().setUp() + + # this causes all the states to match + self.base_details["ubid"] = '86HJPCWQ+2VV-1-3-2-3' + self.base_details["no_default_data"] = False + + self.state = self.property_state_factory.get_property_state(**self.base_details) + self.state.data_state = DATA_STATE_MATCHING + self.state.save() + self.existing_property = self.property_factory.get_property(access_level_instance=self.me_ali) + self.view = PropertyView.objects.create(property=self.existing_property, cycle=self.cycle, state=self.state) + + def test_match_both_good(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_merges_against_existing'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # one Property in right ali + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + + # merged + assert PropertyState.objects.count() == 3 + + # city changed + assert PropertyView.objects.count() == 1 + pv = PropertyView.objects.first() + assert pv.state.city == "Denver" + + def test_match_both_good_but_different(self): + # Set Up + self.base_details["raw_access_level_instance_id"] = self.org.root.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_merges_against_existing_errors'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # Only one Property + self.assertEqual(Property.objects.count(), 1) + + # unmerged + self.assertEqual(PropertyState.objects.count(), 2) + + # city unchanged + assert PropertyView.objects.count() == 1 + pv = PropertyView.objects.first() + assert pv.state.city is None + + def test_match_both_good_but_no_access_to_existing(self): + # Set Up + self.existing_property.access_level_instance = self.sister + self.existing_property.save() + self.import_record.access_level_instance = self.me_ali + self.import_record.save() + + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_merges_against_existing_errors'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # Only one Property + self.assertEqual(Property.objects.count(), 1) + + # unmerged + self.assertEqual(PropertyState.objects.count(), 2) + + # city unchanged + assert PropertyView.objects.count() == 1 + pv = PropertyView.objects.first() + assert pv.state.city is None + + def test_match_incoming_error(self): + # Set Up + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_merges_against_existing'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # Only one Property + self.assertEqual(Property.objects.count(), 1) + + # city unchanged + assert PropertyView.objects.count() == 1 + pv = PropertyView.objects.first() + assert pv.state.city == "Denver" + + # merged + self.assertEqual(PropertyState.objects.count(), 3) + + def test_match_incoming_error_and_no_access_to_existing(self): + # Set Up + self.existing_property.access_level_instance = self.sister + self.existing_property.save() + self.import_record.access_level_instance = self.me_ali + self.import_record.save() + + self.base_details["raw_access_level_instance_id"] = None + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_merges_against_existing_errors'] = 1 + self.blank_result['property_new'] = 0 + self.assertDictContainsSubset(self.blank_result, results) + + # Only one Property + self.assertEqual(Property.objects.count(), 1) + + # unmerged + self.assertEqual(PropertyState.objects.count(), 2) + + # city unchanged + assert PropertyView.objects.count() == 1 + pv = PropertyView.objects.first() + assert pv.state.city is None + + +class TestAHImportMatchExistingDifferentCycle(TestAHImportFile): + def setUp(self): + super().setUp() + + self.property_view_factory = FakePropertyViewFactory(organization=self.org) + + # this causes all the states to match + self.base_details["ubid"] = '86HJPCWQ+2VV-1-3-2-3' + self.base_details["no_default_data"] = False + + self.state = self.property_state_factory.get_property_state(**self.base_details) + self.state.data_state = DATA_STATE_MATCHING + self.state.save() + self.existing_property = self.property_factory.get_property(access_level_instance=self.me_ali) + self.other_cycle = self.cycle_factory.get_cycle(start=datetime(2010, 10, 10)) + self.view = PropertyView.objects.create( + property=self.existing_property, + cycle=self.other_cycle, + state=self.state + ) + + def test_has_ali_merges_and_links(self): + # Set Up - create view for merge + self.property_view_factory.get_property_view(prprty=self.existing_property, cycle=self.cycle) + + # Set Up - update new state info + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_merges_against_existing'] = 1 + self.blank_result['property_links_against_existing'] = 0 # not 1 cause the view it merged into was already linked + self.blank_result['property_new'] = 0 # not 1 cause the property already exists + self.assertDictContainsSubset(self.blank_result, results) + + # one Property in right ali + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + + # 3 in a little merge tree, 1 in the other cycle + assert PropertyState.objects.count() == 4 + + # city changed in the correct view + assert PropertyView.objects.count() == 2 + view_info = PropertyView.objects.values("property_id", "cycle_id", "state__city") + assert list(view_info) == [ + { + "property_id": self.existing_property.id, + "cycle_id": self.other_cycle.id, + "state__city": None, + }, + { + "property_id": self.existing_property.id, + "cycle_id": self.cycle.id, + "state__city": "Denver", + }, + ] + + def test_no_ali_merges_and_links(self): + # Set Up - create view for merge + self.property_view_factory.get_property_view(prprty=self.existing_property, cycle=self.cycle) + + # Set Up - update new state info + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_merges_against_existing'] = 1 + self.blank_result['property_links_against_existing'] = 0 # not 1 cause the view it merged into was already linked + self.blank_result['property_new'] = 0 # not 1 cause the property already exists + self.assertDictContainsSubset(self.blank_result, results) + + # one Property in right ali + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.me_ali + + # 3 in a little merge tree, 1 in the other cycle + assert PropertyState.objects.count() == 4 + + # city changed in the correct view + assert PropertyView.objects.count() == 2 + view_info = PropertyView.objects.values("property_id", "cycle_id", "state__city") + + assert list(view_info) == [ + { + "property_id": self.existing_property.id, + "cycle_id": self.other_cycle.id, + "state__city": None, + }, + { + "property_id": self.existing_property.id, + "cycle_id": self.cycle.id, + "state__city": "Denver", + }, + ] + + def test_has_ali_links(self): + # Set Up - update new state info + self.base_details["raw_access_level_instance_id"] = self.me_ali.id + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_links_against_existing'] = 1 + self.blank_result['property_new'] = 0 # not 1 cause the property already exists + self.assertDictContainsSubset(self.blank_result, results) + + # 1 in each cycle + assert PropertyState.objects.count() == 2 + + # city changed in the correct view + assert PropertyView.objects.count() == 2 + view_info = PropertyView.objects.values("property_id", "property__access_level_instance_id", "cycle_id", "state__city") + assert list(view_info) == [ + { + "property_id": self.existing_property.id, + "property__access_level_instance_id": self.me_ali.id, + "cycle_id": self.other_cycle.id, + "state__city": None, + }, + { + "property_id": self.existing_property.id, + "property__access_level_instance_id": self.me_ali.id, + "cycle_id": self.cycle.id, + "state__city": "Denver", + }, + ] + + def test_has_ali_links_different_ali(self): + # Set Up - update existing state ali + self.existing_property.access_level_instance = self.sister + self.existing_property.save() + + # Set Up - update new state info + self.base_details["raw_access_level_instance_id"] = self.me_ali.id # different ali + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_links_against_existing_errors'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # theres two Properties and two PropertyStates, but one of each is abandoned + self.assertEqual(Property.objects.count(), 2) + assert PropertyState.objects.count() == 2 + + # no change + assert PropertyView.objects.count() == 1 + view_info = PropertyView.objects.values("property_id", "property__access_level_instance_id", "cycle_id", "state__city") + assert list(view_info) == [ + { + "property_id": self.existing_property.id, + "property__access_level_instance_id": self.sister.id, + "cycle_id": self.other_cycle.id, + "state__city": None, + }, + ] + + def test_no_ali_links(self): + # Set Up - update new state info + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_links_against_existing'] = 1 + self.blank_result['property_new'] = 0 # not 1 cause the property already exists + self.assertDictContainsSubset(self.blank_result, results) + + # two properties, but one abandoned + self.assertEqual(Property.objects.count(), 2) + + # 1 in each cycle + assert PropertyState.objects.count() == 2 + + # city changed in the correct view + assert PropertyView.objects.count() == 2 + view_info = PropertyView.objects.values("property_id", "cycle_id", "state__city") + assert list(view_info) == [ + { + "property_id": self.existing_property.id, + "cycle_id": self.other_cycle.id, + "state__city": None, + }, + { + "property_id": self.existing_property.id, + "cycle_id": self.cycle.id, + "state__city": "Denver", + }, + ] + + def test_no_ali_links_no_access(self): + # Set Up - file and existing property have different alis + self.existing_property.access_level_instance = self.sister + self.existing_property.save() + self.import_record.access_level_instance = self.me_ali + self.import_record.save() + + # update new state info + self.base_details["raw_access_level_instance_error"] = "uh oh" + self.base_details['city'] = 'Denver' # so not duplicate + self.property_state_factory.get_property_state(**self.base_details) + + # Action + results = match_and_link_incoming_properties_and_taxlots(*self.action_args) + + # Assert - results + self.blank_result['property_initial_incoming'] = 1 + self.blank_result['property_links_against_existing_errors'] = 1 + self.assertDictContainsSubset(self.blank_result, results) + + # one Property in right ali + self.assertEqual(Property.objects.count(), 1) + p = Property.objects.first() + assert p.access_level_instance == self.sister + + # no change + assert PropertyView.objects.count() == 1 + view_info = PropertyView.objects.values("property_id", "cycle_id", "state__city") + assert list(view_info) == [ + { + "property_id": self.existing_property.id, + "cycle_id": self.other_cycle.id, + "state__city": None, + }, + ] diff --git a/seed/data_importer/tests/test_link_incoming.py b/seed/data_importer/tests/test_link_incoming.py index 8a4b6a0620..582a1d57f5 100644 --- a/seed/data_importer/tests/test_link_incoming.py +++ b/seed/data_importer/tests/test_link_incoming.py @@ -65,6 +65,7 @@ def test_match_merge_link_for_properties(self): 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } self.property_state_factory.get_property_state(**base_state_details) @@ -163,6 +164,7 @@ def test_match_merge_link_for_taxlots(self): 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } self.taxlot_state_factory.get_taxlot_state(**base_state_details) diff --git a/seed/data_importer/tests/test_mapping.py b/seed/data_importer/tests/test_mapping.py index 687a966bb6..8a9c5535c3 100644 --- a/seed/data_importer/tests/test_mapping.py +++ b/seed/data_importer/tests/test_mapping.py @@ -14,7 +14,13 @@ from seed.data_importer import tasks from seed.data_importer.tests.util import FAKE_MAPPINGS from seed.lib.mcm import mapper -from seed.models import ASSESSED_RAW, DATA_STATE_IMPORT, Column +from seed.models import ( + ASSESSED_RAW, + DATA_STATE_IMPORT, + DATA_STATE_MAPPING, + Column, + PropertyState +) from seed.models.column_mappings import get_column_mapping from seed.test_helpers.fake import ( FakePropertyFactory, @@ -255,6 +261,178 @@ def test_mapping_takes_into_account_selected_units(self): self.assertAlmostEqual(state.gross_floor_area, (100 * ureg('m**2')).to('ft**2')) +class TestMappingAccessLevelInstance(DataMappingBaseTestCase): + def setUp(self): + selfvars = self.set_up(ASSESSED_RAW) + self.user, self.org, self.import_file, self.import_record, self.cycle = selfvars + self.property_state_factory = FakePropertyStateFactory(organization=self.org) + + # create tree + self.org.access_level_names = ["1st Gen", "2nd Gen", "3rd Gen"] + mom = self.org.add_new_access_level_instance(self.org.root.id, "mom") + self.me_ali = self.org.add_new_access_level_instance(mom.id, "me") + self.brother_ali = self.org.add_new_access_level_instance(mom.id, "brother") + self.org.save() + + # create state + self.state = self.property_state_factory.get_property_state_as_extra_data( + import_file_id=self.import_file.id, + source_type=ASSESSED_RAW, + data_state=DATA_STATE_IMPORT, + random_extra=42, + ) + + # create mappings + suggested_mappings = mapper.build_column_mapping( + list(self.state.extra_data.keys()) + self.org.access_level_names, + Column.retrieve_all_by_tuple(self.org), + previous_mapping=get_column_mapping, + map_args=[self.org], + thresh=90 + ) + mappings = [] + for raw_column, suggestion in suggested_mappings.items(): + mapping = { + "from_field": raw_column, + "from_units": None, + "to_table_name": suggestion[0], + "to_field": suggestion[1], + "to_field_display_name": suggestion[1], + } + mappings.append(mapping) + Column.create_mappings(mappings, self.org, self.user, self.import_file.id) + + def test_map_good_ah_data(self): + # state has good AH info + self.state.extra_data["1st Gen"] = "root" + self.state.extra_data["2nd Gen"] = "mom" + self.state.extra_data["3rd Gen"] = "me" + self.state.save() + + # map state + tasks.map_data(self.import_file.id) + ps = PropertyState.objects.get( + data_state=DATA_STATE_MAPPING, + organization=self.org, + import_file=self.import_file, + ) + + # extra data gone and raw ali set + assert "2nd Gen" not in ps.extra_data + assert "3rd Gen" not in ps.extra_data + assert ps.raw_access_level_instance == self.me_ali + assert ps.raw_access_level_instance_error is None + + def test_map_good_ah_data_no_permissions_ancestor(self): + self.import_record.access_level_instance = self.me_ali + self.import_record.save() + + # state has good AH info + self.state.extra_data["1st Gen"] = "root" + self.state.extra_data["2nd Gen"] = "mom" + self.state.extra_data["3rd Gen"] = None + self.state.save() + + # map state + tasks.map_data(self.import_file.id) + ps = PropertyState.objects.get( + data_state=DATA_STATE_MAPPING, + organization=self.org, + import_file=self.import_file, + ) + + # extra data gone and raw ali set + assert "2nd Gen" not in ps.extra_data + assert "3rd Gen" not in ps.extra_data + assert ps.raw_access_level_instance_error == "Access Level Instance cannot be accessed with the permissions of this import file." + + def test_map_good_ah_data_no_permissions(self): + self.import_record.access_level_instance = self.me_ali + self.import_record.save() + + # state has good AH info + self.state.extra_data["1st Gen"] = "root" + self.state.extra_data["2nd Gen"] = "mom" + self.state.extra_data["3rd Gen"] = "brother" + self.state.save() + + # map state + tasks.map_data(self.import_file.id) + ps = PropertyState.objects.get( + data_state=DATA_STATE_MAPPING, + organization=self.org, + import_file=self.import_file, + ) + + # extra data gone and raw ali set + assert "2nd Gen" not in ps.extra_data + assert "3rd Gen" not in ps.extra_data + assert ps.raw_access_level_instance_error == "Access Level Information does not match any existing Access Level Instance." + + def test_map_ah_data_missing_columns(self): + # state has missing AH info + self.state.extra_data["1st Gen"] = "root" + # no 2nd Gen + self.state.extra_data["3rd Gen"] = "me" + self.state.save() + + # map state + tasks.map_data(self.import_file.id) + ps = PropertyState.objects.get( + data_state=DATA_STATE_MAPPING, + organization=self.org, + import_file=self.import_file, + ) + + # extra data gone and raw ali error is set + assert "2nd Gen" not in ps.extra_data + assert "3rd Gen" not in ps.extra_data + assert ps.raw_access_level_instance is None + assert ps.raw_access_level_instance_error == "Missing/Incomplete Access Level Column." + + def test_map_ah_data_missing_value(self): + # state has blank AH info + self.state.extra_data["1st Gen"] = "root" + self.state.extra_data["2nd Gen"] = None + self.state.extra_data["3rd Gen"] = "me" + self.state.save() + + # map state + tasks.map_data(self.import_file.id) + ps = PropertyState.objects.get( + data_state=DATA_STATE_MAPPING, + organization=self.org, + import_file=self.import_file, + ) + + # extra data gone and raw ali error is set + assert "2nd Gen" not in ps.extra_data + assert "3rd Gen" not in ps.extra_data + assert ps.raw_access_level_instance is None + assert ps.raw_access_level_instance_error == "Missing/Incomplete Access Level Column." + + def test_map_ah_data_bad_value(self): + # state has bad AH info + self.state.extra_data["1st Gen"] = "root" + self.state.extra_data["2nd Gen"] = "mom" + self.state.extra_data["3rd Gen"] = "I dont exist" + self.state.save() + + # map state + tasks.map_data(self.import_file.id) + ps = PropertyState.objects.get( + data_state=DATA_STATE_MAPPING, + organization=self.org, + import_file=self.import_file, + ) + + # extra data gone and raw ali error is set + assert "2nd Gen" not in ps.extra_data + assert "3rd Gen" not in ps.extra_data + assert ps.raw_access_level_instance is None + assert ps.raw_access_level_instance_error == "Access Level Information does not match any existing Access Level Instance." + + class TestDuplicateFileHeaders(DataMappingBaseTestCase): def setUp(self): filename = getattr(self, 'filename', 'example-data-properties-duplicate-headers.xlsx') diff --git a/seed/data_importer/tests/test_match_incoming.py b/seed/data_importer/tests/test_match_incoming.py index abe7841958..6e8b6f7faf 100644 --- a/seed/data_importer/tests/test_match_incoming.py +++ b/seed/data_importer/tests/test_match_incoming.py @@ -68,6 +68,7 @@ def test_duplicate_properties_identified(self): 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create pair of properties that are exact duplicates self.property_state_factory.get_property_state(**base_details) @@ -99,6 +100,7 @@ def test_duplicate_taxlots_identified(self): 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create pair of properties that are exact duplicates self.taxlot_state_factory.get_taxlot_state(**base_details) @@ -130,6 +132,7 @@ def test_match_properties_if_all_default_fields_match(self): 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create first set of properties that match each other ps_1 = self.property_state_factory.get_property_state(**base_details) @@ -209,6 +212,7 @@ def test_match_taxlots_if_all_default_fields_match(self): 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create first set of taxlots that match each other tls_1 = self.taxlot_state_factory.get_taxlot_state(**base_details) @@ -285,6 +289,7 @@ def test_match_properties_on_ubid(self): 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create set of properties that match each other self.property_state_factory.get_property_state(**base_details) @@ -309,6 +314,7 @@ def test_match_properties_normalized_address_used_instead_of_address_line_1(self 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create set of properties that have the same address_line_1 in slightly different format base_details['address_line_1'] = '123 Match Street' @@ -335,6 +341,7 @@ def test_match_taxlots_normalized_address_used_instead_of_address_line_1(self): 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create set of taxlots that have the same address_line_1 in slightly different format base_details['address_line_1'] = '123 Match Street' @@ -366,6 +373,7 @@ def test_no_matches_if_all_matching_criteria_is_None(self): 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create set of properties that won't match @@ -396,6 +404,7 @@ def test_match_properties_get_rolled_up_into_one_in_the_order_their_uploaded(sel 'import_file_id': self.import_file.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create first set of properties that match each other base_details['city'] = 'Philadelphia' @@ -438,6 +447,7 @@ def test_duplicate_properties_identified(self): 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create property in first ImportFile ps_1 = self.property_state_factory.get_property_state(**base_details) @@ -469,6 +479,7 @@ def test_match_properties_if_all_default_fields_match(self): 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create property in first ImportFile ps_1 = self.property_state_factory.get_property_state(**base_details) @@ -540,6 +551,7 @@ def test_match_properties_rolls_up_multiple_existing_matches_in_id_order_if_they 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create 3 non-matching properties in first ImportFile ps_1 = self.property_state_factory.get_property_state(**base_details) @@ -601,6 +613,7 @@ def test_match_taxlots_if_all_default_fields_match(self): 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create property in first ImportFile tls_1 = self.taxlot_state_factory.get_taxlot_state(**base_details) @@ -672,6 +685,7 @@ def test_match_taxlots_rolls_up_multiple_existing_matches_in_id_order_if_they_ex 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create 3 non-matching taxlots in first ImportFile tls_1 = self.taxlot_state_factory.get_taxlot_state(**base_details) @@ -748,6 +762,7 @@ def test_properties(self): 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # No matching_criteria values @@ -787,6 +802,7 @@ def test_properties(self): 'import_file_id': self.import_file_2.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create 1 duplicate of the 'No matching_criteria values' properties @@ -863,18 +879,30 @@ def test_properties(self): 'import_file_records': None, # This is calculated in a separate process 'property_duplicates_against_existing': 1, 'property_duplicates_within_file': 2, + 'property_duplicates_within_file_errors': 0, 'property_initial_incoming': 10, 'property_merges_against_existing': 1, + 'property_merges_against_existing_errors': 0, + 'property_links_against_existing': 0, + 'property_links_against_existing_errors': 0, 'property_merges_between_existing': 0, 'property_merges_within_file': 2, + 'property_merges_within_file_errors': 0, 'property_new': 4, + 'property_new_errors': 0, 'tax_lot_duplicates_against_existing': 0, 'tax_lot_duplicates_within_file': 0, + 'tax_lot_duplicates_within_file_errors': 0, 'tax_lot_initial_incoming': 0, 'tax_lot_merges_against_existing': 0, + 'tax_lot_merges_against_existing_errors': 0, + 'tax_lot_links_against_existing': 0, + 'tax_lot_links_against_existing_errors': 0, 'tax_lot_merges_between_existing': 0, 'tax_lot_merges_within_file': 0, + 'tax_lot_merges_within_file_errors': 0, 'tax_lot_new': 0, + 'tax_lot_new_errored': 0, } self.assertEqual(results, expected) @@ -893,6 +921,7 @@ def test_taxlots(self): 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # No matching_criteria values @@ -932,6 +961,7 @@ def test_taxlots(self): 'import_file_id': self.import_file_2.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create 2 duplicates of the 'No matching_criteria values' taxlots @@ -1003,18 +1033,30 @@ def test_taxlots(self): 'import_file_records': None, # This is calculated in a separate process 'property_duplicates_against_existing': 0, 'property_duplicates_within_file': 0, + 'property_duplicates_within_file_errors': 0, 'property_initial_incoming': 0, 'property_merges_against_existing': 0, + 'property_merges_against_existing_errors': 0, 'property_merges_between_existing': 0, 'property_merges_within_file': 0, + 'property_merges_within_file_errors': 0, + 'property_links_against_existing': 0, + 'property_links_against_existing_errors': 0, 'property_new': 0, + 'property_new_errors': 0, 'tax_lot_duplicates_against_existing': 1, 'tax_lot_duplicates_within_file': 3, + 'tax_lot_duplicates_within_file_errors': 0, 'tax_lot_initial_incoming': 10, 'tax_lot_merges_against_existing': 1, + 'tax_lot_merges_against_existing_errors': 0, + 'tax_lot_links_against_existing': 0, + 'tax_lot_links_against_existing_errors': 0, 'tax_lot_merges_between_existing': 0, 'tax_lot_merges_within_file': 2, + 'tax_lot_merges_within_file_errors': 0, 'tax_lot_new': 3, + 'tax_lot_new_errored': 0, } self.assertEqual(results, expected) @@ -1065,7 +1107,7 @@ def test_filter_duplicate_states(self): props = self.import_file.find_unmatched_property_states() sub_progress_data = ProgressData(func_name='match_sub_progress', unique_id=123) sub_progress_data.save() - uniq_state_ids, dup_state_count = filter_duplicate_states(props, sub_progress_data.key) + uniq_state_ids, _, dup_state_count = filter_duplicate_states(props, sub_progress_data.key) # There should be 6 uniq states. 5 from the second call, and one of 'The Same Address' self.assertEqual(len(uniq_state_ids), 6) @@ -1128,6 +1170,7 @@ def test_match_buildingsync_works_when_no_existing_scenarios_or_meters(self): 'import_file_id': self.import_file_2.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create a property which will match with the BuildingSync file self.property_state_factory.get_property_state(**base_details) @@ -1180,6 +1223,7 @@ def test_match_buildingsync_works_when_there_are_existing_different_scenarios_an 'import_file_id': self.import_file_2.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + "raw_access_level_instance_id": self.org.root.id, } # Create a property which will match with the BuildingSync file ps_orig = self.property_state_factory.get_property_state(**base_details) @@ -1293,7 +1337,7 @@ def setUp(self): end=date(1999, 12, 31), ) - base_details = {'import_file_id': self.import_file.id} + base_details = {'import_file_id': self.import_file.id, "raw_access_level_instance_id": self.org.root.id} # Properties for cycle 2010_2014 base_details['property_name'] = 'p2010_2014a' base_details['year_ending'] = date(2012, 12, 12) diff --git a/seed/data_importer/tests/test_match_unicode.py b/seed/data_importer/tests/test_match_unicode.py index e14646e05e..b78b4814bb 100644 --- a/seed/data_importer/tests/test_match_unicode.py +++ b/seed/data_importer/tests/test_match_unicode.py @@ -33,7 +33,7 @@ class TestUnicodeNormalization(DataMappingBaseTestCase): def test_unicode_normalization(self): """Test a few cases. The unicodedata.normalize('NFC', text) method combines the - the letter and diacritics, which seems to provide the best compatibility.""" + letter and diacritics, which seems to provide the best compatibility.""" # Guillemets unicode_text = "Café «Déjà Vu»" expected_out = "Café \"Déjà Vu\"" @@ -137,6 +137,7 @@ def test_unicode_matching(self): 'import_file_id': self.import_file_1.id, 'data_state': DATA_STATE_MAPPING, 'no_default_data': False, + 'raw_access_level_instance_id': self.org.root.id, } self.property_state_factory.get_property_state(**base_state_details) diff --git a/seed/docs/views.py b/seed/docs/views.py index 7400d59c92..882578fb70 100644 --- a/seed/docs/views.py +++ b/seed/docs/views.py @@ -64,7 +64,7 @@ def faq_page(request): faq_data[category_name].append(parsed_faq._asdict()) if not request.user.is_anonymous: - initial_org_id, initial_org_name, initial_org_user_role = _get_default_org( + initial_org_id, initial_org_name, initial_org_user_role, access_level_instance_name, access_level_instance_id, is_ali_root, is_ali_leaf = _get_default_org( request.user ) debug = settings.DEBUG diff --git a/seed/lib/mcm/reader.py b/seed/lib/mcm/reader.py index e88395a3da..bf34833a28 100644 --- a/seed/lib/mcm/reader.py +++ b/seed/lib/mcm/reader.py @@ -400,7 +400,7 @@ def XLSDictReader(self, sheet, header_row=0): :param sheet: xlrd Sheet :param header_row: the row index to start with - :returns: Generator yeilding a row as Dict + :returns: Generator yielding a row as Dict """ # save off the headers into a member variable. Only do this once. If XLSDictReader is diff --git a/seed/lib/merging/merging.py b/seed/lib/merging/merging.py index e544454ed6..834043b215 100644 --- a/seed/lib/merging/merging.py +++ b/seed/lib/merging/merging.py @@ -239,6 +239,9 @@ def merge_state(merged_state, state1, state2, priorities, ignore_merge_protectio state2_present_columns ) + default_ali = state1.raw_access_level_instance + merged_state.raw_access_level_instance = default_ali if default_ali is not None else state2.raw_access_level_instance + # merge measures, scenarios, simulations if isinstance(merged_state, PropertyState): PropertyState.merge_relationships(merged_state, state1, state2) diff --git a/seed/lib/progress_data/progress_data.py b/seed/lib/progress_data/progress_data.py index ae18746562..c2a8689bd1 100644 --- a/seed/lib/progress_data/progress_data.py +++ b/seed/lib/progress_data/progress_data.py @@ -180,8 +180,8 @@ def result(self): def increment_value(self): """ - Return the value to increment the progress back. Currently this is always assume that that - size of the step is 1 to the self.total count. + Return the value used to increment the progress. Currently, this always assumes that the + size of the step is 1 / self.total count. :return: float, value to increment the step by """ diff --git a/seed/lib/superperms/orgs/decorators.py b/seed/lib/superperms/orgs/decorators.py index 85209e5f70..8de17e4162 100644 --- a/seed/lib/superperms/orgs/decorators.py +++ b/seed/lib/superperms/orgs/decorators.py @@ -9,16 +9,29 @@ from inspect import signature from django.conf import settings -from django.http import HttpResponseForbidden +from django.core.exceptions import ObjectDoesNotExist +from django.http import HttpResponseForbidden, JsonResponse +from django.utils.datastructures import MultiValueDictKeyError +from rest_framework import status +from seed.data_importer.models import ImportFile, ImportRecord from seed.lib.superperms.orgs.models import ( ROLE_MEMBER, ROLE_OWNER, ROLE_VIEWER, + AccessLevelInstance, Organization, OrganizationUser ) from seed.lib.superperms.orgs.permissions import get_org_id +from seed.models import ( + Analysis, + Goal, + Property, + PropertyView, + TaxLotView, + UbidModel +) # Allow Super Users to ignore permissions. ALLOW_SUPER_USER_PERMS = getattr(settings, 'ALLOW_SUPER_USER_PERMS', True) @@ -66,6 +79,16 @@ def requires_superuser(org_user): return org_user.user.is_superuser +def requires_root_member_access(org_user): + """ User must be an owner or member at the root access level""" + return org_user.access_level_instance.depth == 1 and org_user.role_level >= ROLE_MEMBER + + +def requires_non_leaf_access(org_user): + """ User must be a non leaf member. Exception when user is both root and leaf. """ + return org_user.access_level_instance.is_root() or not org_user.access_level_instance.is_leaf() + + def can_create_sub_org(org_user): return requires_parent_org_owner(org_user) @@ -130,6 +153,8 @@ def can_view_data(org_user): 'requires_owner': requires_owner, 'requires_member': requires_member, 'requires_viewer': requires_viewer, + 'requires_root_member_access': requires_root_member_access, + 'requires_non_leaf_access': requires_non_leaf_access, 'can_create_sub_org': can_create_sub_org, 'can_remove_org': can_remove_org, 'can_invite_member': can_invite_member, @@ -179,9 +204,9 @@ def _validate_permissions(perm_name, request, requires_org): org = Organization.objects.get(pk=org_id) except Organization.DoesNotExist: return _make_resp('org_dne') - # Skip perms checks if settings allow super_users to bypass. if request.user.is_superuser and ALLOW_SUPER_USER_PERMS: + request.access_level_instance_id = org.root.id return try: @@ -190,6 +215,8 @@ def _validate_permissions(perm_name, request, requires_org): ) except OrganizationUser.DoesNotExist: return _make_resp('user_dne') + else: + request.access_level_instance_id = org_user.access_level_instance.id if not PERMS.get(perm_name, lambda x: False)(org_user): return _make_resp('perm_denied') @@ -197,7 +224,6 @@ def _validate_permissions(perm_name, request, requires_org): def has_perm_class(perm_name: str, requires_org: bool = True): """Proceed if user from request has ``perm_name``.""" - def decorator(fn): params = list(signature(fn).parameters) if params and params[0] == 'self': @@ -212,3 +238,205 @@ def _wrapped(request, *args, **kwargs): return _wrapped return decorator + + +def assert_hierarchy_access( + request, + property_id_kwarg=None, + property_view_id_kwarg=None, + param_property_view_id=None, + taxlot_view_id_kwarg=None, + import_file_id_kwarg=None, + param_import_file_id=None, + import_record_id_kwarg=None, + body_ali_id=None, + body_import_file_id=None, + body_property_id=None, + analysis_id_kwarg=None, + ubid_id_kwarg=None, + body_import_record_id=None, + body_property_state_id=None, + body_taxlot_state_id=None, + param_import_record_id=None, + goal_id_kwarg=None, + *args, + **kwargs +): + + """Helper function to has_hierarchy_access""" + body = request.data + params = request.GET + try: + if property_id_kwarg and property_id_kwarg in kwargs: + property = Property.objects.get(pk=kwargs[property_id_kwarg]) + requests_ali = property.access_level_instance + + elif body_property_id and body_property_id in body: + property = Property.objects.get(pk=body[body_property_id]) + requests_ali = property.access_level_instance + + elif body_property_state_id and body_property_state_id in body: + # there should only be one property_view with a specific property state + property_view = PropertyView.objects.get(state_id=body[body_property_state_id]) + requests_ali = property_view.property.access_level_instance + + elif body_taxlot_state_id and body_taxlot_state_id in body: + taxlot_view = TaxLotView.objects.get(state_id=body[body_taxlot_state_id]) + requests_ali = taxlot_view.taxlot.access_level_instance + + elif property_view_id_kwarg and property_view_id_kwarg in kwargs: + property_view = PropertyView.objects.get(pk=kwargs[property_view_id_kwarg]) + requests_ali = property_view.property.access_level_instance + + elif param_property_view_id and param_property_view_id in params: + property_view = PropertyView.objects.get(pk=params[param_property_view_id]) + requests_ali = property_view.property.access_level_instance + + elif param_import_file_id and param_import_file_id in params: + import_file = ImportFile.objects.get(pk=params[param_import_file_id]) + requests_ali = import_file.access_level_instance + + elif taxlot_view_id_kwarg and taxlot_view_id_kwarg in kwargs: + taxlot_view = TaxLotView.objects.get(pk=kwargs[taxlot_view_id_kwarg]) + requests_ali = taxlot_view.taxlot.access_level_instance + + elif import_file_id_kwarg and import_file_id_kwarg in kwargs: + import_file = ImportFile.objects.get(pk=kwargs[import_file_id_kwarg]) + requests_ali = import_file.access_level_instance + + elif body_ali_id and body_ali_id in body: + requests_ali = AccessLevelInstance.objects.get(pk=body[body_ali_id]) + + elif import_record_id_kwarg and import_record_id_kwarg in kwargs: + import_record = ImportRecord.objects.get(pk=kwargs[import_record_id_kwarg]) + requests_ali = import_record.access_level_instance + + elif body_import_file_id and body_import_file_id in body: + import_file = ImportFile.objects.get(pk=body[body_import_file_id]) + requests_ali = import_file.access_level_instance + + elif body_import_record_id and body_import_record_id in body: + import_record = ImportRecord.objects.get(pk=body[body_import_record_id]) + requests_ali = import_record.access_level_instance + + elif param_import_record_id and (param_import_record_id in request.POST or param_import_record_id in request.GET): + import_record_pk = request.POST.get(param_import_record_id, request.GET.get(param_import_record_id)) + import_record = ImportRecord.objects.get(pk=import_record_pk) + requests_ali = import_record.access_level_instance + + elif analysis_id_kwarg and analysis_id_kwarg in kwargs: + if int(kwargs[analysis_id_kwarg]) < 1: + return + analysis = Analysis.objects.get(pk=kwargs[analysis_id_kwarg]) + requests_ali = analysis.access_level_instance + + elif ubid_id_kwarg and ubid_id_kwarg in kwargs: + ubid = UbidModel.objects.get(pk=kwargs[ubid_id_kwarg]) + if ubid.property: + requests_ali = ubid.property.propertyview_set.first().property.access_level_instance + else: + requests_ali = ubid.taxlot.taxlotview_set.first().taxlot.access_level_instance + + elif goal_id_kwarg and goal_id_kwarg in kwargs: + goal = Goal.objects.get(pk=kwargs[goal_id_kwarg]) + body_ali_id = body.get('access_level_instance') + if body_ali_id: + body_ali = AccessLevelInstance.objects.get(pk=body_ali_id) + requests_ali = body_ali if body_ali.depth < goal.access_level_instance.depth else goal.access_level_instance + else: + requests_ali = goal.access_level_instance + + else: + property_view = PropertyView.objects.get(pk=request.GET['property_view_id']) + requests_ali = property_view.property.access_level_instance + + except (ObjectDoesNotExist, MultiValueDictKeyError): + return JsonResponse({ + 'status': 'error', + 'message': 'No such resource.' + }, status=status.HTTP_404_NOT_FOUND) + + user_ali = AccessLevelInstance.objects.get(pk=request.access_level_instance_id) + if not (user_ali == requests_ali or requests_ali.is_descendant_of(user_ali)): + return JsonResponse({ + 'status': 'error', + 'message': 'No such resource.' + }, status=status.HTTP_404_NOT_FOUND) + + +def has_hierarchy_access( + property_id_kwarg=None, + property_view_id_kwarg=None, + param_property_view_id=None, + taxlot_view_id_kwarg=None, + import_file_id_kwarg=None, + param_import_file_id=None, + import_record_id_kwarg=None, + body_ali_id=None, + body_import_file_id=None, + body_property_id=None, + analysis_id_kwarg=None, + ubid_id_kwarg=None, + body_import_record_id=None, + body_property_state_id=None, + body_taxlot_state_id=None, + param_import_record_id=None, + goal_id_kwarg=None +): + """Must be called after has_perm_class""" + def decorator(fn): + params = list(signature(fn).parameters) + if params and params[0] == 'self': + @wraps(fn) + def _wrapped(self, request, *args, **kwargs): + return assert_hierarchy_access( + request, + property_id_kwarg, + property_view_id_kwarg, + param_property_view_id, + taxlot_view_id_kwarg, + import_file_id_kwarg, + param_import_file_id, + import_record_id_kwarg, + body_ali_id, + body_import_file_id, + body_property_id, + analysis_id_kwarg, + ubid_id_kwarg, + body_import_record_id, + body_property_state_id, + body_taxlot_state_id, + param_import_record_id, + goal_id_kwarg, + *args, + **kwargs + ) or fn(self, request, *args, **kwargs) + else: + @wraps(fn) + def _wrapped(request, *args, **kwargs): + return assert_hierarchy_access( + request, + property_id_kwarg, + property_view_id_kwarg, + param_property_view_id, + taxlot_view_id_kwarg, + import_file_id_kwarg, + param_import_file_id, + import_record_id_kwarg, + body_ali_id, + body_import_file_id, + body_property_id, + analysis_id_kwarg, + ubid_id_kwarg, + body_import_record_id, + body_property_state_id, + body_taxlot_state_id, + param_import_record_id, + goal_id_kwarg, + *args, + **kwargs + ) or fn(request, *args, **kwargs) + + return _wrapped + + return decorator diff --git a/seed/lib/superperms/orgs/migrations/0030_accountability_hierarchy.py b/seed/lib/superperms/orgs/migrations/0030_accountability_hierarchy.py new file mode 100644 index 0000000000..181a4ed33b --- /dev/null +++ b/seed/lib/superperms/orgs/migrations/0030_accountability_hierarchy.py @@ -0,0 +1,79 @@ +# Generated by Django 3.2.23 on 2024-03-08 06:05 + +import django.db.models.deletion +from django.db import migrations, models, transaction + + +@transaction.atomic +def create_root_access_levels(apps, schema_editor): + Organization = apps.get_model('orgs', 'Organization') + AccessLevelInstance = apps.get_model('orgs', 'AccessLevelInstance') + + for i, org in enumerate(Organization.objects.all()): + org.access_level_names = [org.name] + org.save() + + AccessLevelInstance.objects.create( + tree_id=i, + organization=org, + name='root', + path={org.access_level_names[0]: 'root'}, + depth=1, + lft=1, + rgt=2, + ) + + +@transaction.atomic +def assign_users_to_root_access_level(apps, schema_editor): + OrganizationUser = apps.get_model('orgs', 'OrganizationUser') + AccessLevelInstance = apps.get_model('orgs', 'AccessLevelInstance') + + root_alis = {ali.organization_id: ali for ali in AccessLevelInstance.objects.filter(depth=1)} + + for user in OrganizationUser.objects.all(): + user.access_level_instance = root_alis[user.organization_id] + user.save(update_fields=['access_level_instance']) + + +class Migration(migrations.Migration): + + dependencies = [ + ('orgs', '0029_auto_20240105_1257'), + ] + + operations = [ + migrations.AddField( + model_name='organization', + name='access_level_names', + field=models.JSONField(default=list), + ), + migrations.CreateModel( + name='AccessLevelInstance', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('lft', models.PositiveIntegerField(db_index=True)), + ('rgt', models.PositiveIntegerField(db_index=True)), + ('tree_id', models.PositiveIntegerField(db_index=True)), + ('depth', models.PositiveIntegerField(db_index=True)), + ('name', models.CharField(max_length=100)), + ('path', models.JSONField()), + ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='orgs.organization')), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='organizationuser', + name='access_level_instance', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='users', to='orgs.accesslevelinstance'), + ), + migrations.RunPython(create_root_access_levels), + migrations.RunPython(assign_users_to_root_access_level, reverse_code=migrations.RunPython.noop), + migrations.AlterField( + model_name='organizationuser', + name='access_level_instance', + field=models.ForeignKey(null=False, on_delete=django.db.models.deletion.CASCADE, related_name='users', to='orgs.accesslevelinstance'), + ) + ] diff --git a/seed/lib/superperms/orgs/models.py b/seed/lib/superperms/orgs/models.py index f42d5503a4..d0cc728b5b 100644 --- a/seed/lib/superperms/orgs/models.py +++ b/seed/lib/superperms/orgs/models.py @@ -8,8 +8,10 @@ from django.conf import settings from django.contrib.auth.models import User -from django.db import models -from django.db.models.signals import pre_delete +from django.db import IntegrityError, models, transaction +from django.db.models.signals import post_save, pre_delete, pre_save +from django.dispatch import receiver +from treebeard.ns_tree import NS_Node from seed.lib.superperms.orgs.exceptions import TooManyNestedOrgs @@ -64,6 +66,7 @@ class Meta: role_level = models.IntegerField( default=ROLE_OWNER, choices=ROLE_LEVEL_CHOICES ) + access_level_instance = models.ForeignKey("AccessLevelInstance", on_delete=models.CASCADE, null=False, related_name="users") def delete(self, *args, **kwargs): """Ensure we preserve at least one Owner for this org.""" @@ -90,6 +93,62 @@ def __str__(self): ) +@receiver(pre_save, sender=OrganizationUser) +def presave_organization_user(sender, instance, **kwargs): + if instance.role_level == ROLE_OWNER and instance.access_level_instance != instance.organization.root: + raise IntegrityError("Owners must be member of the organization's root.") + + +class AccessLevelInstance(NS_Node): + """Node in the Accountability Hierarchy tree""" + name = models.CharField(max_length=100, null=False) + organization = models.ForeignKey('Organization', on_delete=models.CASCADE) + # path automatically maintained dict of ancestors names by access level names. + # See get_path and set_path. + path = models.JSONField(null=False) + + node_order_by = ['name'] + + # TODO: Add constraint that siblings cannot have same name. + + def get_path(self): + """get a dictionary detailing the ancestors of this Access Level Instance + """ + level_names = self.organization.access_level_names + ancestors = { + level_names[depth - 1]: name + for depth, name + in self.get_ancestors().values_list("depth", "name") + } + ancestors[level_names[self.depth - 1]] = self.name + + return ancestors + + def __str__(self): + access_level_name = self.organization.access_level_names[self.depth - 1] + return f"{self.name}: {self.organization.name} Access Level {access_level_name}" + + +@receiver(pre_save, sender=AccessLevelInstance) +def set_path(sender, instance, **kwargs): + # if instance is new, set path + if instance.id is None: + instance.path = instance.get_path() + + # else, if we updated the name... + else: + previous = AccessLevelInstance.objects.get(pk=instance.id) + if instance.name != previous.name: + level_name = instance.organization.access_level_names[instance.depth - 1] + with transaction.atomic(): + # update our path + instance.path[level_name] = instance.name + # update our children's path + for ali in instance.get_descendants(): + ali.path[level_name] = instance.name + ali.save() + + class Organization(models.Model): """A group of people that optionally contains another sub group.""" @@ -229,6 +288,8 @@ class Meta: # Salesforce Functionality salesforce_enabled = models.BooleanField(default=False) + access_level_names = models.JSONField(default=list) + # UBID Threshold ubid_threshold = models.FloatField(default=1.0) @@ -250,7 +311,7 @@ def is_member(self, user): """Return True if user object has a relation to this organization.""" return user in self.users.all() - def add_member(self, user, role=ROLE_OWNER): + def add_member(self, user, access_level_instance_id, role=ROLE_OWNER): """Add a user to an organization. Returns a boolean if a new OrganizationUser record was created""" if OrganizationUser.objects.filter(user=user, organization=self).exists(): return False @@ -260,7 +321,7 @@ def add_member(self, user, role=ROLE_OWNER): user.is_active = True user.save() - _, created = OrganizationUser.objects.get_or_create(user=user, organization=self, role_level=role) + _, created = OrganizationUser.objects.get_or_create(user=user, organization=self, access_level_instance_id=access_level_instance_id, role_level=role) return created @@ -283,6 +344,30 @@ def is_owner(self, user): user=user, role_level=ROLE_OWNER, organization=self, ).exists() + def has_role_member(self, user): + """ + Return True if the user has a relation to this org, with a role of + member. + """ + return OrganizationUser.objects.filter( + user=user, role_level=ROLE_MEMBER, organization=self, + ).exists() + + def is_user_ali_root(self, user): + """ + Return True if the user's ali is at the root of the organization + """ + is_root = False + + ou = OrganizationUser.objects.filter( + user=user, organization=self, + ) + if ou.count() > 0: + ou = ou.first() + if ou.access_level_instance == self.root: + is_root = True + return is_root + def get_exportable_fields(self): """Default to parent definition of exportable fields.""" if self.parent_org: @@ -318,9 +403,29 @@ def parent_id(self): return self.id return self.parent_org.id + def add_new_access_level_instance(self, parent_id: int, name: str) -> AccessLevelInstance: + parent = AccessLevelInstance.objects.get(pk=parent_id) + + if len(self.access_level_names) < parent.depth + 1: + raise UserWarning('Cannot create child at an unnamed level') + + new_access_level_instance = parent.add_child(organization=self, name=name) + + return new_access_level_instance + + def get_access_tree(self, from_ali=None) -> list: + if from_ali is None: + from_ali = self.root + + return AccessLevelInstance.dump_bulk(from_ali) + def __str__(self): return 'Organization: {0}({1})'.format(self.name, self.pk) + @property + def root(self): + return AccessLevelInstance.objects.get(organization=self, depth=1) + def organization_pre_delete(sender, instance, **kwargs): from seed.data_importer.models import ImportFile, ImportRecord @@ -331,3 +436,70 @@ def organization_pre_delete(sender, instance, **kwargs): pre_delete.connect(organization_pre_delete, sender=Organization) + + +@receiver(pre_save, sender=Organization) +def presave_organization(sender, instance, **kwargs): + from seed.models import Column + + if instance.id is None: + return + + previous = Organization.objects.get(pk=instance.id) + previous_access_level_names = previous.access_level_names + + if previous_access_level_names != instance.access_level_names: + _assert_alns_are_valid(instance) + _update_alis_path_keys(instance, previous_access_level_names) + + taken_names = Column.objects.filter(organization=instance, display_name__in=instance.access_level_names).values_list("display_name", flat=True) + if len(taken_names) > 0: + raise ValueError(f"{taken_names} are column names.") + + +def _assert_alns_are_valid(org): + from seed.models import Column + alns = org.access_level_names + + if len(set(alns)) != len(alns): # if not unique + raise ValueError("Organization's access_level_names must be unique.") + + columns_with_same_names = Column.objects.filter(organization=org, display_name__in=alns) + if columns_with_same_names.count() > 0: + repeated_names = set(columns_with_same_names.values_list("display_name", flat=True)) + raise ValueError(f"Access level names cannot match SEED column names: {list(repeated_names)}") + + +def _update_alis_path_keys(org, previous_access_level_names): + """For each instance.access_level_names item changed, update the ali.paths + """ + alis = AccessLevelInstance.objects.filter(organization=org) + min_len = min(len(previous_access_level_names), len(org.access_level_names)) + + with transaction.atomic(): + # for each name in access_level_name... + for i in range(min_len): + previous_access_level_name = previous_access_level_names[i] + current_access_level_name = org.access_level_names[i] + + # If the name was changed, alter the paths of the ALIs. + if previous_access_level_name != current_access_level_name: + for ali in alis: + if previous_access_level_name in ali.path: + ali.path[current_access_level_name] = ali.path[previous_access_level_name] + del ali.path[previous_access_level_name] + ali.save() + + +@receiver(post_save, sender=Organization) +def post_save_organization(sender, instance, created, **kwargs): + """ + Give new Orgs a Accountability Hierarchy root. + """ + if created: + if not instance.access_level_names: + instance.access_level_names = [instance.name] + + root = AccessLevelInstance.add_root(organization=instance, name="root") + root.save() + instance.save() diff --git a/seed/lib/superperms/tests/test_organization_access_levels.py b/seed/lib/superperms/tests/test_organization_access_levels.py new file mode 100644 index 0000000000..dbb693a193 --- /dev/null +++ b/seed/lib/superperms/tests/test_organization_access_levels.py @@ -0,0 +1,117 @@ +# !/usr/bin/env python +# encoding: utf-8 +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" +from django.test import TestCase + +from seed.landing.models import SEEDUser as User +from seed.lib.superperms.orgs.models import AccessLevelInstance +from seed.utils.organizations import create_organization + + +class TestOrganizationAccessLevels(TestCase): + def setUp(self): + user_details = { + 'username': 'test_user@demo.com', + 'password': 'test_pass', + 'email': 'test_user@demo.com' + } + self.fake_user = User.objects.create_user(**user_details) + + def test_tree_on_create(self): + fake_org, _, _ = create_organization(self.fake_user, 'Organization A') + + # has right access_level_names + assert fake_org.access_level_names == ["Organization A"] + + # has right AccessLevelInstances + assert AccessLevelInstance.objects.filter(organization=fake_org).count() == 1 + root = fake_org.root + assert root.name == "root" + + # get right access_tree + assert fake_org.get_access_tree() == [ + { + 'id': root.pk, + 'data': { + 'name': 'root', + 'organization': fake_org.id, + 'path': {'Organization A': 'root'}, + }, + } + ] + + def test_create_level_instance_without_name(self): + fake_org, _, _ = create_organization(self.fake_user, 'Organization A') + + # create access level instance on an unnamed Instance + with self.assertRaises(Exception): + fake_org.add_new_access_level_instance(fake_org.root.id, "mom") + + def test_build_out_tree(self): + fake_org, _, _ = create_organization(self.fake_user, 'Organization A') + + # populate tree + fake_org.access_level_names += ["2nd gen", "3rd gen"] + fake_org.save() + aunt = fake_org.add_new_access_level_instance(fake_org.root.id, "aunt") + mom = fake_org.add_new_access_level_instance(fake_org.root.id, "mom") + me = fake_org.add_new_access_level_instance(mom.id, "me") + + # get tree + assert fake_org.get_access_tree() == [ + { + 'id': fake_org.root.pk, + 'data': { + 'name': 'root', + 'organization': fake_org.id, + 'path': {'Organization A': 'root'}, + }, + 'children': [ + { + 'id': aunt.pk, + 'data': { + 'name': 'aunt', + 'organization': fake_org.id, + 'path': {'Organization A': 'root', '2nd gen': 'aunt'}, + } + }, + { + 'id': mom.pk, + 'data': { + 'name': 'mom', + 'organization': fake_org.id, + 'path': {'Organization A': 'root', '2nd gen': 'mom'}, + }, + 'children': [ + { + 'id': me.pk, + 'data': { + 'name': 'me', + 'organization': fake_org.id, + 'path': {'Organization A': 'root', '2nd gen': 'mom', '3rd gen': 'me'}, + } + } + ] + } + ] + } + ] + + def test_get_path(self): + fake_org, _, _ = create_organization(self.fake_user, 'Organization A') + + # populate tree + fake_org.access_level_names += ["2nd gen", "3rd gen"] + fake_org.save() + fake_org.add_new_access_level_instance(fake_org.root.id, "aunt") + mom = fake_org.add_new_access_level_instance(fake_org.root.id, "mom") + me = fake_org.add_new_access_level_instance(mom.id, "me") + + assert me.get_path() == { + "Organization A": "root", + "2nd gen": "mom", + "3rd gen": "me", + } diff --git a/seed/management/commands/create_default_user.py b/seed/management/commands/create_default_user.py index eb8497f612..b60e56fd92 100644 --- a/seed/management/commands/create_default_user.py +++ b/seed/management/commands/create_default_user.py @@ -73,7 +73,7 @@ def handle(self, *args, **options): self.stdout.write( 'Org <%s> already exists, adding user' % options['organization'], ending='\n' ) - org.add_member(u, ROLE_OWNER) + org.add_member(u, org.root.id, ROLE_OWNER) else: self.stdout.write( 'Creating org <%s> ...' % options['organization'], diff --git a/seed/management/commands/make_superuser.py b/seed/management/commands/make_superuser.py index b81010cb84..0880b984f2 100644 --- a/seed/management/commands/make_superuser.py +++ b/seed/management/commands/make_superuser.py @@ -62,7 +62,7 @@ def handle(self, *args, **options): for org in organizations: print("Adding user to {}.".format(org)) - org.add_member(user) + org.add_member(user, access_level_instance_id=org.root.id) else: # NL added this but is not going to make it the default because it may cause # security issues for others. Not sure yet. Comment here if you think we should diff --git a/seed/migrations/0215_accountability_hierarchy.py b/seed/migrations/0215_accountability_hierarchy.py new file mode 100644 index 0000000000..5dffeef409 --- /dev/null +++ b/seed/migrations/0215_accountability_hierarchy.py @@ -0,0 +1,167 @@ +# Generated by Django 3.2.23 on 2024-03-08 06:05 + +import django.core.validators +import django.db.models.deletion +from django.db import migrations, models, transaction + + +@transaction.atomic +def assign_properties_to_root_access_level(apps, schema_editor): + Property = apps.get_model('seed', 'Property') + AccessLevelInstance = apps.get_model('orgs', 'AccessLevelInstance') + + root_alis = {ali.organization_id: ali for ali in AccessLevelInstance.objects.filter(depth=1)} + + for property in Property.objects.all().iterator(): + property.access_level_instance = root_alis[property.organization_id] + property.save(update_fields=['access_level_instance']) + + +@transaction.atomic +def assign_taxlots_to_root_access_level(apps, schema_editor): + TaxLot = apps.get_model('seed', 'TaxLot') + AccessLevelInstance = apps.get_model('orgs', 'AccessLevelInstance') + + root_alis = {ali.organization_id: ali for ali in AccessLevelInstance.objects.filter(depth=1)} + + for taxlot in TaxLot.objects.all().iterator(): + taxlot.access_level_instance = root_alis[taxlot.organization_id] + taxlot.save(update_fields=['access_level_instance']) + + +@transaction.atomic +def assign_analyses_to_root_access_level(apps, schema_editor): + Analysis = apps.get_model('seed', 'Analysis') + AccessLevelInstance = apps.get_model('orgs', 'AccessLevelInstance') + + if Analysis.objects.filter(organization=None).exists(): + raise ValueError("Some Analyses have no organization, and are orphaned. This shouldn't have happened and these Analyses cannot be migrated. Please add an organization or delete the orphaned analyses and try again.") + + root_alis = {ali.organization_id: ali for ali in AccessLevelInstance.objects.filter(depth=1)} + + for analysis in Analysis.objects.all().iterator(): + analysis.access_level_instance = root_alis[analysis.organization_id] + analysis.save(update_fields=['access_level_instance']) + + +@transaction.atomic +def backfill_historical_notes(apps, schema_editor): + Property = apps.get_model('seed', 'Property') + HistoricalNote = apps.get_model('seed', 'HistoricalNote') + + properties_ids = Property.objects.filter(historical_note__isnull=True).values_list('id', flat=True) + + historical_notes_to_create = [HistoricalNote(property_id=property_id, text='') for property_id in properties_ids] + HistoricalNote.objects.bulk_create(historical_notes_to_create) + + +class Migration(migrations.Migration): + + dependencies = [ + ('orgs', '0030_accountability_hierarchy'), + ('seed', '0214_delete_filtergroup_labels'), + ] + + operations = [ + migrations.CreateModel( + name='Goal', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('target_percentage', models.IntegerField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)])), + ('name', models.CharField(max_length=255, unique=True)), + ('access_level_instance', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='orgs.accesslevelinstance')), + ('area_column', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='goal_area_columns', to='seed.column')), + ('baseline_cycle', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='goal_baseline_cycles', to='seed.cycle')), + ('current_cycle', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='goal_current_cycles', to='seed.cycle')), + ('eui_column1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='goal_eui_column1s', to='seed.column')), + ('eui_column2', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='goal_eui_column2s', to='seed.column')), + ('eui_column3', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='goal_eui_column3s', to='seed.column')), + ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='orgs.organization')), + ], + ), + migrations.AddField( + model_name='analysis', + name='access_level_instance', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='analyses', to='orgs.accesslevelinstance'), + ), + migrations.AddField( + model_name='property', + name='access_level_instance', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='properties', to='orgs.accesslevelinstance'), + ), + migrations.AddField( + model_name='propertystate', + name='raw_access_level_instance', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='orgs.accesslevelinstance'), + ), + migrations.AddField( + model_name='propertystate', + name='raw_access_level_instance_error', + field=models.TextField(null=True), + ), + migrations.AddField( + model_name='taxlot', + name='access_level_instance', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='taxlots', to='orgs.accesslevelinstance'), + ), + migrations.AddField( + model_name='taxlotstate', + name='raw_access_level_instance', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='orgs.accesslevelinstance'), + ), + migrations.AddField( + model_name='taxlotstate', + name='raw_access_level_instance_error', + field=models.TextField(null=True), + ), + migrations.CreateModel( + name='HistoricalNote', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('text', models.TextField(blank=True)), + ('property', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='historical_note', to='seed.property')), + ], + ), + migrations.CreateModel( + name='GoalNote', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('question', models.CharField(blank=True, choices=[('Is this a new construction or acquisition?', 'Is this a new construction or acquisition?'), ('Do you have data to report?', 'Do you have data to report?'), ('Is this value correct?', 'Is this value correct?'), ('Are these values correct?', 'Are these values correct?'), ('Other or multiple flags; explain in Additional Notes field', 'Other or multiple flags; explain in Additional Notes field')], max_length=1024, null=True)), + ('resolution', models.CharField(blank=True, max_length=1024, null=True)), + ('passed_checks', models.BooleanField(default=False)), + ('new_or_acquired', models.BooleanField(default=False)), + ('goal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='seed.goal')), + ('property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='seed.property')), + ], + ), + migrations.RunPython( + code=assign_properties_to_root_access_level, + reverse_code=migrations.RunPython.noop, + ), + migrations.RunPython( + code=assign_taxlots_to_root_access_level, + reverse_code=migrations.RunPython.noop, + ), + migrations.RunPython( + code=assign_analyses_to_root_access_level, + reverse_code=migrations.RunPython.noop, + ), + migrations.RunPython( + code=backfill_historical_notes, + ), + migrations.AlterField( + model_name='property', + name='access_level_instance', + field=models.ForeignKey(null=False, on_delete=django.db.models.deletion.CASCADE, related_name='properties', to='orgs.accesslevelinstance'), + ), + migrations.AlterField( + model_name='taxlot', + name='access_level_instance', + field=models.ForeignKey(null=False, on_delete=django.db.models.deletion.CASCADE, related_name='taxlots', to='orgs.accesslevelinstance'), + ), + migrations.AlterField( + model_name='analysis', + name='access_level_instance', + field=models.ForeignKey(null=False, on_delete=django.db.models.deletion.CASCADE, related_name='analyses', to='orgs.accesslevelinstance'), + ), + ] diff --git a/seed/models/__init__.py b/seed/models/__init__.py index f59de0b4c7..24dfd4289e 100644 --- a/seed/models/__init__.py +++ b/seed/models/__init__.py @@ -44,6 +44,8 @@ from .events import * # noqa from .ubid_models import * # noqa from .uniformat import * # noqa +from .goals import * # noqa +from .goal_notes import * # noqa from .certification import ( # noqa GreenAssessment, diff --git a/seed/models/analyses.py b/seed/models/analyses.py index 567f18d4b7..4d08488b92 100644 --- a/seed/models/analyses.py +++ b/seed/models/analyses.py @@ -10,7 +10,7 @@ from seed.analysis_pipelines.utils import get_json_path from seed.landing.models import SEEDUser as User -from seed.lib.superperms.orgs.models import Organization +from seed.lib.superperms.orgs.models import AccessLevelInstance, Organization logger = logging.getLogger(__name__) @@ -61,6 +61,7 @@ class Analysis(models.Model): status = models.IntegerField(default=PENDING_CREATION, choices=STATUS_TYPES) user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True) organization = models.ForeignKey(Organization, on_delete=models.CASCADE) + access_level_instance = models.ForeignKey(AccessLevelInstance, on_delete=models.CASCADE, null=False, related_name="analyses", blank=False) configuration = models.JSONField(default=dict, blank=True) # parsed_results can contain any results gathered from the resulting file(s) # that are applicable to the entire analysis (i.e., all properties involved). @@ -195,3 +196,6 @@ def in_terminal_state(self): :returns: bool """ return self.status in [self.FAILED, self.STOPPED, self.COMPLETED] + + def can_create(self): + return self.organization.is_user_ali_root(self.user.id) and (self.organization.is_owner(self.user.id) or self.organization.has_role_member(self.user.id)) diff --git a/seed/models/building_file.py b/seed/models/building_file.py index 483c1bb135..69ee92ba1a 100644 --- a/seed/models/building_file.py +++ b/seed/models/building_file.py @@ -137,7 +137,7 @@ def _kbtu_thermal_conversion_factors(self): return self._cache_kbtu_thermal_conversion_factors - def process(self, organization_id, cycle, property_view=None, promote_property_state=True): + def process(self, organization_id, cycle, property_view=None, promote_property_state=True, access_level_instance=None): """ Process the building file that was uploaded and create the correct models for the object @@ -385,7 +385,8 @@ def process(self, organization_id, cycle, property_view=None, promote_property_s # set the property_state to the new one property_state = merged_state - elif not property_view and promote_property_state: + elif not property_view and promote_property_state and access_level_instance: + property_state.raw_access_level_instance = access_level_instance property_view = property_state.promote(cycle) else: return True, property_state, None, messages diff --git a/seed/models/certification.py b/seed/models/certification.py index d3b3998f1d..d7f6bd37e0 100644 --- a/seed/models/certification.py +++ b/seed/models/certification.py @@ -26,12 +26,12 @@ ) from seed.utils.strings import titlecase -DEFAULT_GREEN_ASSESSEMENT_VALIDITY_DURATION = getattr( +DEFAULT_GREEN_ASSESSMENT_VALIDITY_DURATION = getattr( settings, 'GREEN_ASSESSMENT_DEFAULT_VALIDITY_DURATION', None ) -if DEFAULT_GREEN_ASSESSEMENT_VALIDITY_DURATION: - DEFAULT_GREEN_ASSESSEMENT_VALIDITY_DURATION = datetime.timedelta( - DEFAULT_GREEN_ASSESSEMENT_VALIDITY_DURATION +if DEFAULT_GREEN_ASSESSMENT_VALIDITY_DURATION: + DEFAULT_GREEN_ASSESSMENT_VALIDITY_DURATION = datetime.timedelta( + DEFAULT_GREEN_ASSESSMENT_VALIDITY_DURATION ) # logger = logging.getLogger(__name__) @@ -91,7 +91,7 @@ def __str__(self): is_integer_score = models.BooleanField(default=True) validity_duration = models.DurationField( null=True, blank=True, - default=DEFAULT_GREEN_ASSESSEMENT_VALIDITY_DURATION + default=DEFAULT_GREEN_ASSESSMENT_VALIDITY_DURATION ) class Meta: diff --git a/seed/models/columns.py b/seed/models/columns.py index c3fd8e09f3..d82f7612fe 100644 --- a/seed/models/columns.py +++ b/seed/models/columns.py @@ -21,6 +21,7 @@ from past.builtins import basestring from seed.lib.superperms.orgs.models import Organization as SuperOrganization +from seed.lib.superperms.orgs.models import OrganizationUser from seed.models.column_mappings import ColumnMapping from seed.models.models import Unit @@ -110,6 +111,8 @@ class Column(models.Model): 'import_file', 'long_lat', 'merge_state', + 'raw_access_level_instance_error', + 'raw_access_level_instance_id', 'source_type', 'updated', ] + EXCLUDED_COLUMN_RETURN_FIELDS @@ -950,7 +953,7 @@ def create_mappings(mappings, organization, user, import_file_id=None): # Take the existing object and return the same object with the db column objects added to # the dictionary (to_column_object and from_column_object) - mappings = Column._column_fields_to_columns(mappings, organization) + mappings = Column._column_fields_to_columns(mappings, organization, user) for mapping in mappings: if isinstance(mapping, dict): try: @@ -1007,7 +1010,7 @@ def create_mappings(mappings, organization, user, import_file_id=None): return True @staticmethod - def _column_fields_to_columns(fields, organization): + def _column_fields_to_columns(fields, organization, user): """ List of dictionaries to process into column objects. This method will create the columns if they did not previously exist. Note that fields are probably mutable, but the method @@ -1041,115 +1044,47 @@ def _column_fields_to_columns(fields, organization): Returns: dict with lists of columns to which is mappable. """ - - def select_col_obj(column_name, table_name, organization_column): - if organization_column: - return [organization_column] - else: - # Try for "global" column definitions, e.g., BEDES. - Note the BEDES are not - # loaded into the database as of 9/8/2016 so not sure if this code is ever - # exercised - obj = Column.objects.filter(organization=None, column_name=column_name).first() - - if obj: - # create organization mapped column - obj.pk = None - obj.id = None - obj.organization = organization - obj.save() - - return [obj] - else: - if table_name: - obj, _ = Column.objects.get_or_create( - organization=organization, - column_name=column_name, - table_name=table_name, - is_extra_data=is_extra_data, - ) - return [obj] - else: - obj, _ = Column.objects.get_or_create( - organization=organization, - column_name=column_name, - is_extra_data=is_extra_data, - ) - return [obj] - # Container to store the dicts with the Column object new_data = [] + org_user = OrganizationUser.objects.get(organization=organization, user=user) + is_root_user = org_user.access_level_instance == organization.root for field in fields: new_field = field - - # Check if the extra_data field in the model object is a database column - is_extra_data = True - for c in Column.DATABASE_COLUMNS: - if field['to_table_name'] == c['table_name'] and field['to_field'] == c[ - 'column_name']: - is_extra_data = False - break - - try: - to_org_col, _ = Column.objects.get_or_create( - organization=organization, - column_name=field['to_field'], - table_name=field['to_table_name'], - is_extra_data=is_extra_data - ) - except Column.MultipleObjectsReturned: - _log.debug("More than one to_column found for {}.{}".format(field['to_table_name'], - field['to_field'])) - # raise Exception("Cannot handle more than one to_column returned for {}.{}".format( - # field['to_field'], field['to_table_name'])) - - # TODO: write something to remove the duplicate columns - to_org_col = Column.objects.filter(organization=organization, - column_name=field['to_field'], - table_name=field['to_table_name'], - is_extra_data=is_extra_data).first() - _log.debug("Grabbing the first to_column") - - try: - # the from column is the field in the import file, thus the table_name needs to be - # blank. Eventually need to handle passing in import_file_id - from_org_col, _ = Column.objects.update_or_create( - organization=organization, - table_name='', - column_name=field['from_field'], - is_extra_data=False, # Column objects representing raw/header rows are NEVER extra data - defaults={'units_pint': field.get('from_units', None)} - ) - except Column.MultipleObjectsReturned: - # We want to avoid the ambiguity of having multiple Column objects for a specific raw column. - # To do that, delete all multiples along with any associated ColumnMapping objects. - _log.debug( - "More than one from_column found for {}.{}".format(field['to_table_name'], - field['to_field'])) - - all_from_cols = Column.objects.filter( - organization=organization, - table_name='', - column_name=field['from_field'], - is_extra_data=False - ) - - ColumnMapping.objects.filter(column_raw__id__in=models.Subquery(all_from_cols.values('id'))).delete() - all_from_cols.delete() - - from_org_col = Column.objects.create( - organization=organization, - table_name='', - units_pint=field.get('from_units', None), - column_name=field['from_field'], - column_description=field['from_field'], - is_extra_data=False # Column objects representing raw/header rows are NEVER extra data - ) - _log.debug("Creating a new from_column") - - new_field['to_column_object'] = select_col_obj(field['to_field'], - field['to_table_name'], to_org_col) - new_field['from_column_object'] = select_col_obj(field['from_field'], "", from_org_col) + is_ah_data = any([ + field['to_field'] == name for name in organization.access_level_names + ]) + is_extra_data = not any([ + field['to_table_name'] == c['table_name'] and field['to_field'] == c['column_name'] + for c in Column.DATABASE_COLUMNS + ]) + + to_col_params = { + "organization": organization, + "column_name": field['to_field'], + "table_name": '' if is_ah_data else field['to_table_name'], + "is_extra_data": is_extra_data, + } + if is_root_user or is_ah_data: + to_org_col, _ = Column.objects.get_or_create(**to_col_params) + else: + try: + to_org_col = Column.objects.get(**to_col_params) + except Column.DoesNotExist: + raise PermissionError(f"user does not have permission to create column {field['to_field']}") + + # the from column is the field in the import file, thus the table_name needs to be + # blank. Eventually need to handle passing in import_file_id + from_org_col, _ = Column.objects.update_or_create( + organization=organization, + table_name='', + column_name=field['from_field'], + is_extra_data=False, # Column objects representing raw/header rows are NEVER extra data + defaults={'units_pint': field.get('from_units', None)} + ) + + new_field['to_column_object'] = [to_org_col] + new_field['from_column_object'] = [from_org_col] new_data.append(new_field) return new_data @@ -1613,5 +1548,14 @@ def validate_model(sender, **kwargs): if 'raw' in kwargs and not kwargs['raw']: instance.full_clean() + if instance.display_name is not None and instance.organization is not None: + if instance.display_name in instance.organization.access_level_names: + raise IntegrityError("This display name is already an access level name and cannot be used.") + + if instance.organization_id: + org = SuperOrganization.objects.get(pk=instance.organization_id) + if instance.display_name in org.access_level_names: + raise ValidationError("This display name is an organization access level name.") + pre_save.connect(validate_model, sender=Column) diff --git a/seed/models/compliance_metrics.py b/seed/models/compliance_metrics.py index 223a3cf7a2..48fba60570 100644 --- a/seed/models/compliance_metrics.py +++ b/seed/models/compliance_metrics.py @@ -44,7 +44,7 @@ class ComplianceMetric(models.Model): def __str__(self): return 'Program Metric - %s' % self.name - def evaluate(self): + def evaluate(self, user_ali): response = { 'meta': { 'organization': self.organization.id, @@ -61,7 +61,6 @@ def evaluate(self): query_dict = QueryDict(mutable=True) if self.filter_group and self.filter_group.query_dict: query_dict.update(self.filter_group.query_dict) - # print(f"query dict: {query_dict}") # grab cycles cycle_ids = self.cycles.values_list('pk', flat=True).order_by('start') @@ -95,6 +94,7 @@ def evaluate(self): property_response = properties_across_cycles_with_filters( self.organization_id, + user_ali, cycle_ids, query_dict, column_ids diff --git a/seed/models/data_views.py b/seed/models/data_views.py index 5809d0e526..4b518f544b 100644 --- a/seed/models/data_views.py +++ b/seed/models/data_views.py @@ -24,11 +24,11 @@ class DataView(models.Model): cycles = models.ManyToManyField(Cycle) filter_groups = models.ManyToManyField(FilterGroup) - def get_inventory(self): - views_by_filter_group_id, _ = self.views_by_filter() + def get_inventory(self, user_ali): + views_by_filter_group_id, _ = self.views_by_filter(user_ali) return views_by_filter_group_id - def views_by_filter(self): + def views_by_filter(self, user_ali): filter_group_views = {} views_by_filter_group_id = {} for filter_group in self.filter_groups.all(): @@ -37,8 +37,8 @@ def views_by_filter(self): query_dict = QueryDict(mutable=True) query_dict.update(filter_group.query_dict) for cycle in self.cycles.all(): - filter_views = self._get_filter_group_views(cycle, query_dict) - label_views = self._get_label_views(cycle, filter_group) + filter_views = self._get_filter_group_views(cycle, query_dict, user_ali) + label_views = self._get_label_views(cycle, filter_group, user_ali) views = self._combine_views(filter_views, label_views) filter_group_views[filter_group.id][cycle.id] = views for view in views: @@ -47,7 +47,7 @@ def views_by_filter(self): return views_by_filter_group_id, filter_group_views - def evaluate(self, columns): + def evaluate(self, columns, user_ali): # RETURN VALUE STRUCTURE # meta: {data_view: data_view.id, organization: organization.id}, @@ -67,7 +67,7 @@ def evaluate(self, columns): # 'Average': 123, # 'Count': 123, # 'Maximum': 123, - # 'Minumum': 123, + # 'Minimum': 123, # 'Sum': 123, # 'views_by_default_field: { # view.state.default_field || state.id: 123, @@ -102,7 +102,7 @@ def evaluate(self, columns): } } - response['views_by_filter_group_id'], views_by_filter = self.views_by_filter() + response['views_by_filter_group_id'], views_by_filter = self.views_by_filter(user_ali) # assign data based on source column id for column in columns: @@ -223,7 +223,7 @@ def _evaluate_extra_data(self, states, aggregation, column): return round(type_to_aggregate[aggregation], 2) def _evaluate_derived_column(self, states, aggregation, column): - # to evluate a derived_column: DerivedColumn.evaluate(propertyState) + # to evaluate a derived_column: DerivedColumn.evaluate(propertyState) values = [] for state in states: @@ -241,27 +241,33 @@ def _combine_views(self, filter_views, label_views): else: return list(filter_views) - def _get_label_views(self, cycle, filter_group): + def _get_label_views(self, cycle, filter_group, user_ali): if not (filter_group.and_labels.exists() or filter_group.or_labels.exists() or filter_group.exclude_labels.exists()): return None + permissions_filter = { + "property__access_level_instance__lft__gte": user_ali.lft, + "property__access_level_instance__rgt__lte": user_ali.rgt, + } + and_labels = filter_group.and_labels.all() or_labels = filter_group.or_labels.all() exclude_labels = filter_group.exclude_labels.all() views = None + if and_labels.exists(): # and - views = views or cycle.propertyview_set.all() + views = views or cycle.propertyview_set.filter(**permissions_filter) for label in and_labels: views = views.filter(labels=label) if or_labels.exists(): # or - views = views or cycle.propertyview_set.all() + views = views or cycle.propertyview_set.filter(**permissions_filter) views = views.filter(labels__in=or_labels) if exclude_labels.exists(): # exclude - views = views or cycle.propertyview_set.all() + views = views or cycle.propertyview_set.filter(**permissions_filter) views = views.exclude(labels__in=exclude_labels) return list(views) - def _get_filter_group_views(self, cycle, query_dict): + def _get_filter_group_views(self, cycle, query_dict, user_ali): org_id = self.organization.id columns = Column.retrieve_all( org_id=org_id, @@ -271,13 +277,18 @@ def _get_filter_group_views(self, cycle, query_dict): ) annotations = {} try: - filters, annotations, order_by = build_view_filters_and_sorts(query_dict, columns) + filters, annotations, order_by = build_view_filters_and_sorts(query_dict, columns, 'property') except Exception: logging.error('error with filter group') views_list = ( PropertyView.objects.select_related('property', 'state', 'cycle') - .filter(property__organization_id=org_id, cycle=cycle) + .filter( + property__organization_id=org_id, + cycle=cycle, + property__access_level_instance__lft__gte=user_ali.lft, + property__access_level_instance__rgt__lte=user_ali.rgt, + ) ) views_list = views_list.annotate(**annotations).filter(filters).order_by(*order_by) diff --git a/seed/models/goal_notes.py b/seed/models/goal_notes.py new file mode 100644 index 0000000000..cbd6139121 --- /dev/null +++ b/seed/models/goal_notes.py @@ -0,0 +1,30 @@ +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" +from django.db import models + +from seed.models import Goal, Property + + +class GoalNote(models.Model): + QUESTION_CHOICES = ( + ('Is this a new construction or acquisition?', 'Is this a new construction or acquisition?'), + ('Do you have data to report?', 'Do you have data to report?'), + ('Is this value correct?', 'Is this value correct?'), + ('Are these values correct?', 'Are these values correct?'), + ('Other or multiple flags; explain in Additional Notes field', 'Other or multiple flags; explain in Additional Notes field'), + ) + + goal = models.ForeignKey(Goal, on_delete=models.CASCADE) + property = models.ForeignKey(Property, on_delete=models.CASCADE) + + question = models.CharField(max_length=1024, choices=QUESTION_CHOICES, blank=True, null=True) + resolution = models.CharField(max_length=1024, blank=True, null=True) + passed_checks = models.BooleanField(default=False) + new_or_acquired = models.BooleanField(default=False) + + def serialize(self): + from seed.serializers.goal_notes import GoalNoteSerializer + serializer = GoalNoteSerializer(self) + return serializer.data diff --git a/seed/models/goals.py b/seed/models/goals.py new file mode 100644 index 0000000000..f4fcf22718 --- /dev/null +++ b/seed/models/goals.py @@ -0,0 +1,73 @@ +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" + +from django.core.validators import MaxValueValidator, MinValueValidator +from django.db import models +from django.db.models import Q +from django.db.models.signals import post_save +from django.dispatch import receiver + +from seed.models import ( + AccessLevelInstance, + Column, + Cycle, + Organization, + Property +) + + +class Goal(models.Model): + organization = models.ForeignKey(Organization, on_delete=models.CASCADE) + baseline_cycle = models.ForeignKey(Cycle, on_delete=models.CASCADE, related_name='goal_baseline_cycles') + current_cycle = models.ForeignKey(Cycle, on_delete=models.CASCADE, related_name='goal_current_cycles') + access_level_instance = models.ForeignKey(AccessLevelInstance, on_delete=models.CASCADE) + eui_column1 = models.ForeignKey(Column, on_delete=models.CASCADE, related_name='goal_eui_column1s') + # eui column 2 and 3 optional + eui_column2 = models.ForeignKey(Column, on_delete=models.CASCADE, related_name='goal_eui_column2s', blank=True, null=True) + eui_column3 = models.ForeignKey(Column, on_delete=models.CASCADE, related_name='goal_eui_column3s', blank=True, null=True) + area_column = models.ForeignKey(Column, on_delete=models.CASCADE, related_name='goal_area_columns') + target_percentage = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(100)]) + name = models.CharField(max_length=255, unique=True) + + def __str__(self): + return f"Goal - {self.name}" + + def eui_columns(self): + """ Preferred column order """ + eui_columns = [self.eui_column1, self.eui_column2, self.eui_column3] + return [column for column in eui_columns if column] + + def properties(self): + properties = Property.objects.filter( + Q(views__cycle=self.baseline_cycle) | + Q(views__cycle=self.current_cycle), + access_level_instance__lft__gte=self.access_level_instance.lft, + access_level_instance__rgt__lte=self.access_level_instance.rgt + ).distinct() + + return properties + + +@receiver(post_save, sender=Goal) +def post_save_goal(sender, instance, **kwargs): + from seed.models import GoalNote + + # retrieve a flat set of all property ids associated with this goal + goal_property_ids = set(instance.properties().values_list('id', flat=True)) + + # retrieve a flat set of all property ids from the previous goal (through goal note which has not been created/updated yet) + previous_property_ids = set(instance.goalnote_set.values_list('property_id', flat=True)) + + # create, or update has added more properties to the goal + new_property_ids = goal_property_ids - previous_property_ids + # update has removed properties from the goal + removed_property_ids = previous_property_ids - goal_property_ids + + if new_property_ids: + new_goal_notes = [GoalNote(goal=instance, property_id=id) for id in new_property_ids] + GoalNote.objects.bulk_create(new_goal_notes) + + if removed_property_ids: + GoalNote.objects.filter(goal=instance, property_id__in=removed_property_ids).delete() diff --git a/seed/models/notes.py b/seed/models/notes.py index efe80b3b47..275cf1b4e9 100644 --- a/seed/models/notes.py +++ b/seed/models/notes.py @@ -9,7 +9,7 @@ from seed.landing.models import SEEDUser as User from seed.lib.superperms.orgs.models import Organization -from seed.models import MAX_NAME_LENGTH, PropertyView, TaxLotView +from seed.models import MAX_NAME_LENGTH, Property, PropertyView, TaxLotView from seed.utils.generic import obj_to_dict @@ -108,3 +108,13 @@ def create_from_edit(self, user_id, view, new_values, previous_values): def to_dict(self): return obj_to_dict(self) + + +class HistoricalNote(models.Model): + text = models.TextField(blank=True) + property = models.OneToOneField(Property, on_delete=models.CASCADE, related_name='historical_note') + + def serialize(self): + from seed.serializers.historical_notes import HistoricalNoteSerializer + serializer = HistoricalNoteSerializer(self) + return serializer.data diff --git a/seed/models/properties.py b/seed/models/properties.py index 62d25081a1..9135d7ad74 100644 --- a/seed/models/properties.py +++ b/seed/models/properties.py @@ -13,6 +13,7 @@ from django.conf import settings from django.contrib.gis.db import models as geomodels +from django.core.exceptions import ValidationError from django.db import IntegrityError, models, transaction from django.db.models import Case, Value, When from django.db.models.signals import ( @@ -30,7 +31,7 @@ from seed.data_importer.models import ImportFile # from seed.utils.cprofile import cprofile from seed.lib.mcm.cleaners import date_cleaner -from seed.lib.superperms.orgs.models import Organization +from seed.lib.superperms.orgs.models import AccessLevelInstance, Organization from seed.models.cycles import Cycle from seed.models.models import ( DATA_STATE, @@ -73,6 +74,7 @@ class Property(models.Model): The property can also reference a parent property. """ organization = models.ForeignKey(Organization, on_delete=models.CASCADE) + access_level_instance = models.ForeignKey(AccessLevelInstance, on_delete=models.CASCADE, null=False, related_name="properties") # Handle properties that may have multiple properties (e.g., buildings) parent_property = models.ForeignKey('Property', on_delete=models.CASCADE, blank=True, null=True) @@ -132,6 +134,28 @@ def copy_meters(self, source_property_id, source_persists=True): target_meter.copy_readings(source_meter, overlaps_possible=True) +@receiver(pre_save, sender=Property) +def set_default_access_level_instance(sender, instance, **kwargs): + """If ALI not set, put this Property as the root.""" + if instance.access_level_instance_id is None: + root = AccessLevelInstance.objects.get(organization_id=instance.organization_id, depth=1) + instance.access_level_instance_id = root.id + + bad_taxlotproperty = TaxLotProperty.objects \ + .filter(property_view__property=instance) \ + .exclude(taxlot_view__taxlot__access_level_instance=instance.access_level_instance) \ + .exists() + if bad_taxlotproperty: + raise ValidationError("cannot change property's ALI to AlI different than related taxlots.") + + +@receiver(post_save, sender=Property) +def post_save_property(sender, instance, created, **kwargs): + if created: + from seed.models import HistoricalNote + HistoricalNote.objects.get_or_create(property=instance) + + class PropertyState(models.Model): """Store a single property. This contains all the state information about the property @@ -159,6 +183,8 @@ class PropertyState(models.Model): organization = models.ForeignKey(Organization, on_delete=models.CASCADE) data_state = models.IntegerField(choices=DATA_STATE, default=DATA_STATE_UNKNOWN) merge_state = models.IntegerField(choices=MERGE_STATE, default=MERGE_STATE_UNKNOWN, null=True) + raw_access_level_instance = models.ForeignKey(AccessLevelInstance, null=True, on_delete=models.SET_NULL) + raw_access_level_instance_error = models.TextField(null=True) jurisdiction_property_id = models.TextField(null=True, blank=True, db_collation='natural_sort') @@ -360,7 +386,13 @@ def promote(self, cycle, property_id=None): _log.error("Could not promote this property") return None else: - prop = Property.objects.create(organization=self.organization) + if self.raw_access_level_instance is None: + _log.error("Could not promote this property: no raw_access_level_instance") + return None + + prop = Property.objects.create(organization=self.organization, access_level_instance=self.raw_access_level_instance) + self.raw_access_level_instance = None + self.raw_access_level_instance_error = None pv = PropertyView.objects.create(property=prop, cycle=cycle, state=self) diff --git a/seed/models/tax_lot_properties.py b/seed/models/tax_lot_properties.py index c9892f900b..d05f0d05c2 100644 --- a/seed/models/tax_lot_properties.py +++ b/seed/models/tax_lot_properties.py @@ -14,8 +14,11 @@ from django.apps import apps from django.contrib.gis.db.models import GeometryField from django.contrib.gis.geos import GEOSGeometry +from django.core.exceptions import ValidationError from django.db import models from django.db.models import Count +from django.db.models.signals import pre_save +from django.dispatch import receiver from django.utils.timezone import make_naive from quantityfield.units import ureg @@ -140,6 +143,7 @@ def serialize( show_columns: Optional[list[int]], columns_from_database: list[dict], include_related: bool = True, + goal_id: int = False, ) -> list[dict]: """ This method takes a list of TaxLotViews or PropertyViews and returns the data along @@ -264,9 +268,11 @@ def serialize( obj_dict['merged_indicator'] = obj.state_id in merged_state_ids - # This is only applicable to Properties since Tax Lots don't have meters if this_cls == 'Property': + obj_dict.update(obj.property.access_level_instance.get_path()) obj_dict['meters_exist_indicator'] = len(obj.property.meters.all()) > 0 + else: + obj_dict.update(obj.taxlot.access_level_instance.get_path()) # bring in GIS data obj_dict[lookups['bounding_box']] = bounding_box_wkt(obj.state) @@ -287,6 +293,12 @@ def serialize( if obj_dict.get('measures'): del obj_dict['measures'] + # add goal note data + if goal_id: + goal_note = obj.property.goalnote_set.filter(goal=goal_id).first() + obj_dict['goal_note'] = goal_note.serialize() if goal_note else None + obj_dict['historical_note'] = obj.property.historical_note.serialize() + results.append(obj_dict) return results @@ -431,3 +443,12 @@ def get_related( join_map[getattr(join, lookups['obj_view_id'])] = [join_dict] return join_map + + +@receiver(pre_save, sender=TaxLotProperty) +def presave_organization(sender, instance, **kwargs): + p_ali = instance.property_view.property.access_level_instance.pk + t_ali = instance.taxlot_view.taxlot.access_level_instance.pk + + if p_ali != t_ali: + raise ValidationError("taxlot and property must have same access level instance.") diff --git a/seed/models/tax_lots.py b/seed/models/tax_lots.py index 70be18b232..fe51acff13 100644 --- a/seed/models/tax_lots.py +++ b/seed/models/tax_lots.py @@ -11,13 +11,14 @@ from os import path from django.contrib.gis.db import models as geomodels +from django.core.exceptions import ValidationError from django.db import models from django.db.models import Case, Value, When from django.db.models.signals import m2m_changed, post_save, pre_save from django.dispatch import receiver from seed.data_importer.models import ImportFile -from seed.lib.superperms.orgs.models import Organization +from seed.lib.superperms.orgs.models import AccessLevelInstance, Organization from seed.models.cycles import Cycle from seed.models.models import ( DATA_STATE, @@ -46,6 +47,7 @@ class TaxLot(models.Model): # NOTE: we have been calling this the organization. We # should stay consistent, although I prefer the name organization (!super_org) organization = models.ForeignKey(Organization, on_delete=models.CASCADE) + access_level_instance = models.ForeignKey(AccessLevelInstance, on_delete=models.CASCADE, null=False, related_name="taxlots") # Track when the entry was created and when it was updated created = models.DateTimeField(auto_now_add=True) @@ -55,6 +57,21 @@ def __str__(self): return 'TaxLot - %s' % self.pk +@receiver(pre_save, sender=TaxLot) +def set_default_access_level_instance(sender, instance, **kwargs): + """If ALI not set, put this TaxLot as the root.""" + if instance.access_level_instance_id is None: + root = AccessLevelInstance.objects.get(organization_id=instance.organization_id, depth=1) + instance.access_level_instance_id = root.id + + bad_taxlotproperty = TaxLotProperty.objects \ + .filter(taxlot_view__taxlot=instance) \ + .exclude(property_view__property__access_level_instance=instance.access_level_instance) \ + .exists() + if bad_taxlotproperty: + raise ValidationError("cannot change property's ALI to AlI different than related properties.") + + class TaxLotState(models.Model): # The state field names should match pretty close to the pdf, just # because these are the most 'public' fields in terms of @@ -67,6 +84,8 @@ class TaxLotState(models.Model): organization = models.ForeignKey(Organization, on_delete=models.CASCADE) data_state = models.IntegerField(choices=DATA_STATE, default=DATA_STATE_UNKNOWN) merge_state = models.IntegerField(choices=MERGE_STATE, default=MERGE_STATE_UNKNOWN, null=True) + raw_access_level_instance = models.ForeignKey(AccessLevelInstance, null=True, on_delete=models.SET_NULL) + raw_access_level_instance_error = models.TextField(null=True) custom_id_1 = models.CharField(max_length=255, null=True, blank=True, db_collation='natural_sort') @@ -135,7 +154,13 @@ def promote(self, cycle): if self.organization is None: _log.error("organization is None") - taxlot = TaxLot.objects.create(organization=self.organization) + if self.raw_access_level_instance is None: + _log.error("Could not promote this taxlot: no raw_access_level_instance") + return None + + taxlot = TaxLot.objects.create(organization=self.organization, access_level_instance=self.raw_access_level_instance) + self.raw_access_level_instance = None + self.raw_access_level_instance_error = None tlv = TaxLotView.objects.create(taxlot=taxlot, cycle=cycle, state=self) diff --git a/seed/serializers/access_level_instances.py b/seed/serializers/access_level_instances.py new file mode 100644 index 0000000000..1c3f07947e --- /dev/null +++ b/seed/serializers/access_level_instances.py @@ -0,0 +1,16 @@ +# !/usr/bin/env python +# encoding: utf-8 +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" +from rest_framework import serializers + +from seed.models import AccessLevelInstance + + +class AccessLevelInstanceSerializer(serializers.ModelSerializer): + + class Meta: + model = AccessLevelInstance + fields = '__all__' diff --git a/seed/serializers/data_views.py b/seed/serializers/data_views.py index b5dc9873c5..78cf9c1406 100644 --- a/seed/serializers/data_views.py +++ b/seed/serializers/data_views.py @@ -53,11 +53,11 @@ def update(self, instance, validated_data): instance.save() # if new parameters are provided, delete previous ones so we can create the new params - paramters_data = validated_data.get('parameters') - if paramters_data: + parameters_data = validated_data.get('parameters') + if parameters_data: DataViewParameter.objects.filter(data_view=instance).delete() - for parameter in paramters_data: + for parameter in parameters_data: DataViewParameter.objects.create(data_view=instance, **parameter) return instance diff --git a/seed/serializers/goal_notes.py b/seed/serializers/goal_notes.py new file mode 100644 index 0000000000..bb78fc83ea --- /dev/null +++ b/seed/serializers/goal_notes.py @@ -0,0 +1,14 @@ +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" +from rest_framework import serializers + +from seed.models import GoalNote + + +class GoalNoteSerializer(serializers.ModelSerializer): + + class Meta: + model = GoalNote + fields = '__all__' diff --git a/seed/serializers/goals.py b/seed/serializers/goals.py new file mode 100644 index 0000000000..15c4952289 --- /dev/null +++ b/seed/serializers/goals.py @@ -0,0 +1,48 @@ +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" +from django.core.exceptions import ValidationError +from rest_framework import serializers + +from seed.models import Goal + + +class GoalSerializer(serializers.ModelSerializer): + + class Meta: + model = Goal + fields = '__all__' + + def to_representation(self, obj): + result = super().to_representation(obj) + result['level_name_index'] = obj.access_level_instance.depth - 1 + return result + + def validate(self, data): + # partial update allows a cycle or ali to be blank + baseline_cycle = data.get('baseline_cycle') or self.instance.baseline_cycle + current_cycle = data.get('current_cycle') or self.instance.current_cycle + organization = data.get('organization') or self.instance.organization + ali = data.get('access_level_instance') or self.instance.access_level_instance + + if baseline_cycle == current_cycle: + raise ValidationError('Cycles must be unique.') + + if baseline_cycle.end > current_cycle.end: + raise ValidationError('Baseline Cycle must precede Current Cycle.') + + if not all([ + getattr(baseline_cycle, 'organization', None) == organization, + getattr(current_cycle, 'organization', None) == organization, + getattr(ali, 'organization', None) == organization + ]): + raise ValidationError('Organization mismatch.') + + # non Null columns must be unique + eui_columns = [data.get('eui_column1'), data.get('eui_column2'), data.get('eui_column3')] + unique_columns = {column for column in eui_columns if column is not None} + if len(unique_columns) < len([column for column in eui_columns if column is not None]): + raise ValidationError('Columns must be unique.') + + return data diff --git a/seed/serializers/historical_notes.py b/seed/serializers/historical_notes.py new file mode 100644 index 0000000000..743b08c31f --- /dev/null +++ b/seed/serializers/historical_notes.py @@ -0,0 +1,14 @@ +""" +SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. +See also https://github.com/seed-platform/seed/main/LICENSE.md +""" +from rest_framework import serializers + +from seed.models import HistoricalNote + + +class HistoricalNoteSerializer(serializers.ModelSerializer): + + class Meta: + model = HistoricalNote + fields = '__all__' diff --git a/seed/serializers/properties.py b/seed/serializers/properties.py index 985388f275..6377cf6a7f 100644 --- a/seed/serializers/properties.py +++ b/seed/serializers/properties.py @@ -27,6 +27,9 @@ TaxLotProperty, TaxLotView ) +from seed.serializers.access_level_instances import ( + AccessLevelInstanceSerializer +) from seed.serializers.building_file import BuildingFileSerializer from seed.serializers.certification import ( GreenAssessmentPropertyReadOnlySerializer @@ -109,6 +112,7 @@ class PropertySerializer(serializers.ModelSerializer): updated = serializers.DateTimeField("%Y-%m-%dT%H:%M:%S.%fZ", default_timezone=pytz.utc, read_only=True) inventory_documents = InventoryDocumentSerializer(many=True, read_only=True) + access_level_instance = AccessLevelInstanceSerializer(many=False, read_only=True) class Meta: model = Property @@ -123,6 +127,27 @@ def many_init(cls, *args, **kwargs): return PropertyListSerializer(*args, **kwargs) +class CreatePropertySerializer(serializers.ModelSerializer): + # The created and updated fields are in UTC time and need to be casted accordingly in this format + created = serializers.DateTimeField("%Y-%m-%dT%H:%M:%S.%fZ", default_timezone=pytz.utc, read_only=True) + updated = serializers.DateTimeField("%Y-%m-%dT%H:%M:%S.%fZ", default_timezone=pytz.utc, read_only=True) + + inventory_documents = InventoryDocumentSerializer(many=True, read_only=True) + access_level_instance_id = serializers.IntegerField(required=True) + organization_id = serializers.IntegerField(required=True) + + class Meta: + model = Property + fields = ( + 'id', + 'organization_id', + 'access_level_instance_id', + 'created', + 'updated', + 'inventory_documents', + ) + + class PropertyMinimalSerializer(serializers.ModelSerializer): """Define fields to avoid label lookup""" @@ -225,6 +250,7 @@ class PropertyStatePromoteWritableSerializer(serializers.ModelSerializer): # to support the old state serializer method with the PROPERTY_STATE_FIELDS variables import_file_id = serializers.IntegerField(allow_null=True, read_only=True) organization_id = serializers.IntegerField() + raw_access_level_instance_id = serializers.IntegerField() # read-only core fields id = serializers.IntegerField(read_only=True) diff --git a/seed/static/seed/images/ali-tree-example-lg.webp b/seed/static/seed/images/ali-tree-example-lg.webp new file mode 100644 index 0000000000..49118a5880 Binary files /dev/null and b/seed/static/seed/images/ali-tree-example-lg.webp differ diff --git a/seed/static/seed/js/controllers/admin_controller.js b/seed/static/seed/js/controllers/admin_controller.js index 4b88296374..959e68517f 100644 --- a/seed/static/seed/js/controllers/admin_controller.js +++ b/seed/static/seed/js/controllers/admin_controller.js @@ -10,12 +10,14 @@ angular.module('BE.seed.controller.admin', []).controller('admin_controller', [ 'organization_service', 'column_mappings_service', 'uploader_service', + 'ah_service', 'auth_payload', 'organizations_payload', 'user_profile_payload', 'users_payload', 'Notification', '$window', + '$translate', // eslint-disable-next-line func-names function ( $scope, @@ -25,12 +27,14 @@ angular.module('BE.seed.controller.admin', []).controller('admin_controller', [ organization_service, column_mappings_service, uploader_service, + ah_service, auth_payload, organizations_payload, user_profile_payload, users_payload, Notification, - $window + $window, + $translate ) { $scope.is_superuser = auth_payload.auth.requires_superuser; $scope.user = {}; @@ -51,6 +55,25 @@ angular.module('BE.seed.controller.admin', []).controller('admin_controller', [ css: 'alert-success' }; $scope.username = `${user_profile_payload.first_name} ${user_profile_payload.last_name}`; + $scope.level_names = []; + $scope.level_name_index = null; + $scope.roles = [{ + name: $translate.instant('Owner'), + value: 'owner' + }, { + name: $translate.instant('Member'), + value: 'member' + }, { + name: $translate.instant('Viewer'), + value: 'viewer' + }]; + + let access_level_instances_by_depth = {}; + + $scope.change_selected_level_index = () => { + const new_level_instance_depth = parseInt($scope.level_name_index, 10) + 1; + $scope.potential_level_instances = access_level_instances_by_depth[new_level_instance_depth]; + }; const update_alert = (is_ok, message) => { $scope.alert.show = true; @@ -59,23 +82,57 @@ angular.module('BE.seed.controller.admin', []).controller('admin_controller', [ }; $scope.update_alert = update_alert; + const get_users = () => { + user_service.get_users().then((data) => { + $scope.org.users = data.users; + }); + }; + + const process_organizations = (data) => { + $scope.org_user.organizations = data.organizations; + _.forEach($scope.org_user.organizations, (org) => { + org.total_inventory = _.reduce(org.cycles, (sum, cycle) => sum + cycle.num_properties + cycle.num_taxlots, 0); + }); + }; + + const get_organizations = () => organization_service.get_organizations().then(process_organizations).catch((response) => { + $log.log({ message: 'error from data call', status: response.status, data: response.data }); + update_alert(false, `error getting organizations: ${response.data.message}`); + }); + + $scope.org_form.new_org = () => { + $scope.user.organization = undefined; + $scope.user.access_level_instance_id = undefined; + $scope.level_name_index = undefined; + }; + $scope.org_form.existing_org = () => { + $scope.user.org_name = undefined; + $scope.user.access_level_instance_id = undefined; + $scope.level_name_index = undefined; + + organization_service.get_organization_access_level_tree($scope.user.organization.id).then((access_level_tree) => { + $scope.level_names = access_level_tree.access_level_names; + access_level_instances_by_depth = ah_service.calculate_access_level_instances_by_depth(access_level_tree.access_level_tree); + }); + }; $scope.org_form.reset = () => { + $scope.user = { role: $scope.roles[0].value }; $scope.org.user_email = ''; $scope.org.name = ''; }; $scope.org_form.add = (org) => { organization_service .add(org) - .then(() => { - get_organizations().then(() => { - $scope.$emit('organization_list_updated'); - }); + .then(async () => { + await get_organizations(); + $scope.$emit('organization_list_updated'); update_alert(true, `Organization ${org.name} created`); }) .catch((response) => { update_alert(false, `error creating organization: ${response.data.message}`); }); }; + $scope.user_form.add = (user) => { user_service .add(user) @@ -98,41 +155,24 @@ angular.module('BE.seed.controller.admin', []).controller('admin_controller', [ update_alert(false, `error creating user: ${response.data.message}`); }); }; - $scope.org_form.not_ready = () => _.isUndefined($scope.org.email) || organization_exists($scope.org.name); - - var organization_exists = (name) => { + const organization_exists = (name) => { const orgs = _.map($scope.org_user.organizations, (org) => org.name.toLowerCase()); return orgs.includes(name.toLowerCase()); }; + $scope.org_form.not_ready = () => $scope.org.email === undefined || organization_exists($scope.org.name); + $scope.user_form.not_ready = () => !$scope.user.organization && !$scope.user.org_name; $scope.user_form.reset = () => { - $scope.user = {}; + $scope.user = { role: $scope.roles[0].value }; + $scope.level_names = []; }; $scope.org_form.reset(); $scope.user_form.reset(); - var get_users = () => { - user_service.get_users().then((data) => { - $scope.org.users = data.users; - }); - }; - - const process_organizations = (data) => { - $scope.org_user.organizations = data.organizations; - _.forEach($scope.org_user.organizations, (org) => { - org.total_inventory = _.reduce(org.cycles, (sum, cycle) => sum + cycle.num_properties + cycle.num_taxlots, 0); - }); - }; - - var get_organizations = () => organization_service.get_organizations().then(process_organizations, (response) => { - $log.log({ message: 'error from data call', status: response.status, data: response.data }); - update_alert(false, `error getting organizations: ${response.data.message}`); - }); - $scope.get_organizations_users = (org) => { if (org) { organization_service @@ -180,6 +220,7 @@ angular.module('BE.seed.controller.admin', []).controller('admin_controller', [ }; $scope.confirm_column_mappings_delete = (org) => { + // eslint-disable-next-line no-restricted-globals,no-alert const yes = confirm(`Are you sure you want to delete the '${org.name}' column mappings? This will invalidate preexisting mapping review data`); if (yes) { $scope.delete_org_column_mappings(org); @@ -203,6 +244,7 @@ angular.module('BE.seed.controller.admin', []).controller('admin_controller', [ * for an org's inventory. */ $scope.confirm_inventory_delete = (org) => { + // eslint-disable-next-line no-restricted-globals,no-alert const yes = confirm(`Are you sure you want to PERMANENTLY delete '${org.name}'s properties and tax lots?`); if (yes) { $scope.delete_org_inventory(org); @@ -233,8 +275,10 @@ angular.module('BE.seed.controller.admin', []).controller('admin_controller', [ }; $scope.confirm_org_delete = (org) => { + // eslint-disable-next-line no-restricted-globals const yes = confirm(`Are you sure you want to PERMANENTLY delete the entire '${org.name}' organization?`); if (yes) { + // eslint-disable-next-line no-restricted-globals const again = confirm(`Deleting an organization is permanent. Confirm again to delete '${org.name}'`); if (again) { $scope.delete_org(org); diff --git a/seed/static/seed/js/controllers/analyses_controller.js b/seed/static/seed/js/controllers/analyses_controller.js index 8ddb4f93be..0057551d51 100644 --- a/seed/static/seed/js/controllers/analyses_controller.js +++ b/seed/static/seed/js/controllers/analyses_controller.js @@ -11,20 +11,32 @@ angular 'cycles_payload', 'organization_payload', 'organization_service', - 'users_payload', + // 'users_payload', 'auth_payload', 'messages_payload', 'urls', 'analyses_service', 'Notification', // eslint-disable-next-line func-names - function ($scope, analyses_payload, cycles_payload, organization_payload, organization_service, users_payload, auth_payload, messages_payload, urls, analyses_service, Notification) { + function ( + $scope, + analyses_payload, + cycles_payload, + organization_payload, + organization_service, + //users_payload, + auth_payload, + messages_payload, + urls, + analyses_service, + Notification + ) { $scope.org = organization_payload.organization; $scope.auth = auth_payload.auth; $scope.analyses = analyses_payload.analyses; $scope.views = analyses_payload.views; $scope.original_views = analyses_payload.original_views; - $scope.users = users_payload.users; + // $scope.users = users_payload.users; $scope.messages = messages_payload.messages; $scope.cycles = cycles_payload.cycles; diff --git a/seed/static/seed/js/controllers/column_mappings_controller.js b/seed/static/seed/js/controllers/column_mappings_controller.js index 770d5fe16c..c36e082b98 100644 --- a/seed/static/seed/js/controllers/column_mappings_controller.js +++ b/seed/static/seed/js/controllers/column_mappings_controller.js @@ -374,7 +374,7 @@ angular.module('BE.seed.controller.column_mappings', []).controller('column_mapp '
' + '

Replacing Existing Columns

' + '
' + - '
This action replaces any of your current columns with the comma-delmited columns you provided. Would you like to continue?
' + + '
This action replaces any of your current columns with the comma-delimited columns you provided. Would you like to continue?
' + '
' + '' + '' + diff --git a/seed/static/seed/js/controllers/create_sub_organization_modal_controller.js b/seed/static/seed/js/controllers/create_sub_organization_modal_controller.js index ef837270a9..c915cefd29 100644 --- a/seed/static/seed/js/controllers/create_sub_organization_modal_controller.js +++ b/seed/static/seed/js/controllers/create_sub_organization_modal_controller.js @@ -13,6 +13,8 @@ angular.module('BE.seed.controller.create_sub_organization_modal', []).controlle $scope.sub_org = {}; $scope.error_message = ''; + + $scope.org_id = organization.id; /** * creates a sub organization with an owner */ diff --git a/seed/static/seed/js/controllers/data_upload_modal_controller.js b/seed/static/seed/js/controllers/data_upload_modal_controller.js index 96839a1921..8be0d49ee0 100644 --- a/seed/static/seed/js/controllers/data_upload_modal_controller.js +++ b/seed/static/seed/js/controllers/data_upload_modal_controller.js @@ -32,9 +32,11 @@ angular.module('BE.seed.controller.data_upload_modal', []).controller('data_uplo 'uploader_service', '$state', 'audit_template_service', + 'auth_service', 'dataset_service', 'mapping_service', 'matching_service', + 'organization_service', 'inventory_service', 'spinner_utility', 'step', @@ -54,9 +56,11 @@ angular.module('BE.seed.controller.data_upload_modal', []).controller('data_uplo uploader_service, $state, audit_template_service, + auth_service, dataset_service, mapping_service, matching_service, + organization_service, inventory_service, spinner_utility, step, @@ -91,7 +95,18 @@ angular.module('BE.seed.controller.data_upload_modal', []).controller('data_uplo * newly created data set * file: the file being upload file.filename is the file's name */ - $scope.organization = organization; + $scope.organization = organization + // it would be better to resolve these from the calling controller, but + // this modal is multi-purpose and called from all kinds of places + // get full organization payload (to get inventory count) + organization_service.get_organization(organization.id).then((data) => { + $scope.organization = data.organization; + }); + // get auth (to display column settings link) + auth_service.is_authorized(organization.id, ['requires_viewer', 'requires_owner']).then((data) => { + $scope.auth = data.auth; + }); + $scope.dataset = { name: '', disabled() { @@ -374,8 +389,13 @@ angular.module('BE.seed.controller.data_upload_modal', []).controller('data_uplo $scope.uploader.progress = (25 * progress.loaded) / progress.total; break; + case 'ali_upload_complete': + // access level instances file upload complete + save_access_level_instances_data(file.stored_filename, file.organization_id); + break; + case 'upload_complete': - var current_step = $scope.step.number; + const current_step = $scope.step.number; $scope.uploader.status_message = 'upload complete'; $scope.dataset.filename = file.filename; $scope.source_type = file.source_type; @@ -636,10 +656,35 @@ angular.module('BE.seed.controller.data_upload_modal', []).controller('data_uplo }); }; + /** + * save_access_level_instances_data: saves Access Level Instances data + * @param {string} filename - the name of the import file + * @param organization_id + * + */ + const save_access_level_instances_data = (filename, organization_id) => { + $scope.uploader.status_message = 'saving data'; + $scope.uploader.progress = 0; + uploader_service.save_access_level_instance_data(filename, organization_id).then((data) => { + const progress = _.clamp(data.progress, 0, 100); + uploader_service.check_progress_loop(data.progress_key, progress, 1 - (progress / 100), (progress_data) => { + $scope.uploader.status_message = 'saving complete'; + $scope.uploader.progress = 100; + $scope.access_level_issues = progress_data.message; + $scope.step.number = 21; + }, (data) => { + $log.error(data.message); + if (_.has(data, 'stacktrace')) $log.error(data.stacktrace); + $scope.step_12_error_message = data.data ? data.data.message : data.message; + $scope.step.number = 12; + }, $scope.uploader); + }); + }; + /** * save_raw_assessed_data: saves Assessed data * - * @param {string} file_id: the id of the import file + * @param {string} file_id - the id of the import file * @param cycle_id * @param is_meter_data * @param multiple_cycle_upload @@ -721,10 +766,14 @@ angular.module('BE.seed.controller.data_upload_modal', []).controller('data_uplo $scope.property_initial_incoming = result_data.properties.initial_incoming; $scope.property_duplicates_against_existing = result_data.properties.duplicates_against_existing; $scope.property_duplicates_within_file = result_data.properties.duplicates_within_file; + $scope.property_duplicates_within_file_errors = result_data.properties.duplicates_within_file_errors; $scope.property_merges_against_existing = result_data.properties.merges_against_existing; + $scope.property_merges_against_existing_errors = result_data.properties.merges_against_existing_errors; $scope.property_merges_between_existing = result_data.properties.merges_between_existing; $scope.property_merges_within_file = result_data.properties.merges_within_file; + $scope.property_merges_within_file_errors = result_data.properties.merges_within_file_errors; $scope.property_new = result_data.properties.new; + $scope.property_new_errors = result_data.properties.new_errors; $scope.properties_geocoded_high_confidence = result_data.properties.geocoded_high_confidence; $scope.properties_geocoded_low_confidence = result_data.properties.geocoded_low_confidence; @@ -734,10 +783,14 @@ angular.module('BE.seed.controller.data_upload_modal', []).controller('data_uplo $scope.tax_lot_initial_incoming = result_data.tax_lots.initial_incoming; $scope.tax_lot_duplicates_against_existing = result_data.tax_lots.duplicates_against_existing; $scope.tax_lot_duplicates_within_file = result_data.tax_lots.duplicates_within_file; + $scope.tax_lot_duplicates_within_file_errors = result_data.tax_lots.duplicates_within_file_errors; $scope.tax_lot_merges_against_existing = result_data.tax_lots.merges_against_existing; + $scope.tax_lot_merges_against_existing_errors = result_data.tax_lots.merges_against_existing_errors; $scope.tax_lot_merges_between_existing = result_data.tax_lots.merges_between_existing; $scope.tax_lot_merges_within_file = result_data.tax_lots.merges_within_file; + $scope.tax_lot_merges_within_file_errors = result_data.tax_lots.merges_within_file_errors; $scope.tax_lot_new = result_data.tax_lots.new; + $scope.tax_lot_new_errors = result_data.tax_lots.new_errors; $scope.tax_lots_geocoded_high_confidence = result_data.tax_lots.geocoded_high_confidence; $scope.tax_lots_geocoded_low_confidence = result_data.tax_lots.geocoded_low_confidence; @@ -866,6 +919,15 @@ angular.module('BE.seed.controller.data_upload_modal', []).controller('data_uplo saveAs(new Blob([data.join('\r\n')], { type: 'text/csv' }), 'import_issues.csv'); }; + $scope.export_access_level_issues = (issues) => { + const data = ['Instance Name,Message']; + angular.forEach(issues, (value, key) => { + data.push(`"${key}","${value.message}"`); + }); + + saveAs(new Blob([data.join('\r\n')], { type: 'text/csv' }), 'access_level_instance_issues.csv'); + }; + $scope.export_meter_data = (results, new_file_name) => { const data = [results.columnDefs.map((c) => c.displayName || c.name).join(',')]; const keys = results.columnDefs.map((c) => c.name); diff --git a/seed/static/seed/js/controllers/goal_editor_modal_controller.js b/seed/static/seed/js/controllers/goal_editor_modal_controller.js new file mode 100644 index 0000000000..0a52b5fa70 --- /dev/null +++ b/seed/static/seed/js/controllers/goal_editor_modal_controller.js @@ -0,0 +1,137 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.controller.goal_editor_modal', []) + .controller('goal_editor_modal_controller', [ + '$scope', + '$state', + '$stateParams', + '$uibModalInstance', + 'Notification', + 'ah_service', + 'goal_service', + 'access_level_tree', + 'area_columns', + 'auth_payload', + 'cycles', + 'eui_columns', + 'goal', + 'organization', + 'write_permission', + // eslint-disable-next-line func-names + function ( + $scope, + $state, + $stateParams, + $uibModalInstance, + Notification, + ah_service, + goal_service, + access_level_tree, + area_columns, + auth_payload, + cycles, + eui_columns, + goal, + organization, + write_permission + ) { + $scope.auth = auth_payload.auth; + $scope.organization = organization; + $scope.write_permission = write_permission; + $scope.goal = goal || {}; + $scope.access_level_tree = access_level_tree.access_level_tree; + $scope.level_names = access_level_tree.access_level_names.map((level, i) => ({ + index: i, + name: level + })); + $scope.cycles = cycles; + $scope.area_columns = area_columns; + $scope.eui_columns = eui_columns; + // allow "none" as an option + if (!eui_columns.find((col) => col.id === null && col.displayName === '')) { + $scope.eui_columns.unshift({ id: null, displayName: '' }); + } + $scope.valid = false; + + const sort_goals = (goals) => goals.sort((a, b) => (a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1)); + const get_goals = () => { + goal_service.get_goals().then((result) => { + $scope.goals = result.status === 'success' ? sort_goals(result.goals) : []; + }); + }; + get_goals(); + + $scope.$watch('goal', (cur, old) => { + $scope.goal_changed = cur != old; + }, true); + + const access_level_instances_by_depth = ah_service.calculate_access_level_instances_by_depth($scope.access_level_tree); + + $scope.change_selected_level_index = () => { + const new_level_instance_depth = parseInt($scope.goal.level_name_index, 10) + 1; + $scope.potential_level_instances = access_level_instances_by_depth[new_level_instance_depth]; + }; + $scope.change_selected_level_index(); + + $scope.set_goal = (goal) => { + $scope.goal = goal; + $scope.change_selected_level_index(); + }; + + $scope.save_goal = () => { + $scope.goal_changed = false; + const goal_fn = $scope.goal.id ? goal_service.update_goal : goal_service.create_goal; + // if new goal, assign org id + $scope.goal.organization = $scope.goal.organization || $scope.organization.id; + goal_fn($scope.goal).then((result) => { + if (result.status === 200 || result.status === 201) { + Notification.success({ message: 'Goal saved', delay: 5000 }); + $scope.errors = null; + $scope.goal.id = $scope.goal.id || result.data.id; + get_goals(); + $scope.set_goal($scope.goal); + } else { + $scope.errors = [`Unexpected response status: ${result.status}`]; + const result_errors = 'errors' in result.data ? result.data.errors : result.data; + if (result_errors instanceof Object) { + for (const key in result_errors) { + const key_string = key == 'non_field_errors' ? 'Error' : key; + $scope.errors.push(`${key_string}: ${JSON.stringify(result_errors[key])}`); + } + } else { + $scope.errors = $scope.errors.push(result_errors); + } + } + }); + }; + + $scope.delete_goal = (goal_id) => { + const goal = $scope.goals.find((goal) => goal.id === goal_id); + if (!goal) return Notification.warning({ message: 'Unexpected Error', delay: 5000 }); + + if (!confirm(`Are you sure you want to delete Goal "${goal.name}"`)) return; + + goal_service.delete_goal(goal_id).then((response) => { + if (response.status === 204) { + Notification.success({ message: 'Goal deleted successfully', delay: 5000 }); + } else { + Notification.warning({ message: 'Unexpected Error', delay: 5000 }); + } + get_goals(); + if (goal_id == $scope.goal.id) { + $scope.goal = null; + } + }); + }; + + $scope.new_goal = () => { + $scope.goal = {}; + }; + + $scope.close = () => { + const goal_name = $scope.goal ? $scope.goal.name : null; + $uibModalInstance.close(goal_name); + }; + }]); diff --git a/seed/static/seed/js/controllers/insights_property_controller.js b/seed/static/seed/js/controllers/insights_property_controller.js index ea408cfa7f..0ddeeb3a72 100644 --- a/seed/static/seed/js/controllers/insights_property_controller.js +++ b/seed/static/seed/js/controllers/insights_property_controller.js @@ -619,7 +619,8 @@ angular.module('BE.seed.controller.insights_property', []).controller('insights_ controller: 'update_item_labels_modal_controller', resolve: { inventory_ids: $scope.visibleIds, - inventory_type: () => 'properties' + inventory_type: () => 'properties', + is_ali_root: () => $scope.menu.user.is_ali_root } }); }; diff --git a/seed/static/seed/js/controllers/inventory_detail_analyses_controller.js b/seed/static/seed/js/controllers/inventory_detail_analyses_controller.js index 08b89a7a57..2bce249377 100644 --- a/seed/static/seed/js/controllers/inventory_detail_analyses_controller.js +++ b/seed/static/seed/js/controllers/inventory_detail_analyses_controller.js @@ -11,7 +11,7 @@ angular.module('BE.seed.controller.inventory_detail_analyses', []).controller('i 'inventory_service', 'inventory_payload', 'analyses_payload', - 'users_payload', + // 'users_payload', 'organization_payload', 'views_payload', 'urls', @@ -30,7 +30,7 @@ angular.module('BE.seed.controller.inventory_detail_analyses', []).controller('i inventory_service, inventory_payload, analyses_payload, - users_payload, + // users_payload, organization_payload, views_payload, urls, @@ -46,7 +46,7 @@ angular.module('BE.seed.controller.inventory_detail_analyses', []).controller('i $scope.cycle = inventory_payload.cycle; // WARNING: $scope.org is used by "child" controller - analysis_details_controller $scope.org = organization_payload.organization; - $scope.users = users_payload.users; + // $scope.users = users_payload.users; $scope.analyses = analyses_payload.analyses; $scope.inventory = { view_id: $stateParams.view_id diff --git a/seed/static/seed/js/controllers/inventory_detail_analyses_modal_controller.js b/seed/static/seed/js/controllers/inventory_detail_analyses_modal_controller.js index 6f23d0d170..a69f4a2636 100644 --- a/seed/static/seed/js/controllers/inventory_detail_analyses_modal_controller.js +++ b/seed/static/seed/js/controllers/inventory_detail_analyses_modal_controller.js @@ -15,12 +15,14 @@ angular.module('BE.seed.controller.inventory_detail_analyses_modal', []).control 'inventory_ids', 'current_cycle', 'cycles', + 'user', // eslint-disable-next-line func-names - function ($scope, $log, $uibModalInstance, Notification, analyses_service, inventory_ids, current_cycle, cycles) { + function ($scope, $log, $uibModalInstance, Notification, analyses_service, inventory_ids, current_cycle, cycles, user) { $scope.inventory_count = inventory_ids.length; // used to disable buttons on submit $scope.waiting_for_server = false; $scope.cycles = cycles; + $scope.user = user; $scope.new_analysis = { name: null, @@ -76,8 +78,12 @@ angular.module('BE.seed.controller.inventory_detail_analyses_modal', []).control case 'CO2': $scope.new_analysis.configuration = { - save_co2_results: true + save_co2_results: false }; + // only root users can create columns + if (user.is_ali_root && ['member', 'owner'].includes(user.organization.user_role)) { + $scope.new_analysis.configuration.save_co2_results = true + } break; case 'BETTER': @@ -117,7 +123,7 @@ angular.module('BE.seed.controller.inventory_detail_analyses_modal', []).control } $scope.waiting_for_server = true; - analyses_service.create_analysis($scope.new_analysis.name, $scope.new_analysis.service, $scope.new_analysis.configuration, inventory_ids).then( + analyses_service.create_analysis($scope.new_analysis.name, $scope.new_analysis.service, $scope.new_analysis.configuration, inventory_ids, window.BE.access_level_instance_id).then( (data) => { $scope.waiting_for_server = false; Notification.primary('Created Analysis'); diff --git a/seed/static/seed/js/controllers/inventory_detail_controller.js b/seed/static/seed/js/controllers/inventory_detail_controller.js index 6156e0bd34..4f1d898e2a 100644 --- a/seed/static/seed/js/controllers/inventory_detail_controller.js +++ b/seed/static/seed/js/controllers/inventory_detail_controller.js @@ -28,7 +28,7 @@ angular.module('BE.seed.controller.inventory_detail', []).controller('inventory_ 'inventory_payload', 'views_payload', 'analyses_payload', - 'users_payload', + // 'users_payload', 'columns', 'derived_columns_payload', 'profiles', @@ -66,7 +66,7 @@ angular.module('BE.seed.controller.inventory_detail', []).controller('inventory_ inventory_payload, views_payload, analyses_payload, - users_payload, + // users_payload, columns, derived_columns_payload, profiles, @@ -120,6 +120,14 @@ angular.module('BE.seed.controller.inventory_detail', []).controller('inventory_ $scope.historical_items = inventory_payload.history; $scope.item_state = inventory_payload.state; $scope.inventory_docs = $scope.inventory_type === 'properties' ? inventory_payload.property.inventory_documents : null; + const ali = $scope.inventory_type === 'properties' ? + inventory_payload.property.access_level_instance : + inventory_payload.taxlot.access_level_instance; + + $scope.ali_path = {}; + if (typeof ali === 'object') { + $scope.ali_path = ali.path; + } $scope.order_historical_items_with_scenarios = () => { $scope.historical_items_with_scenarios = $scope.historical_items ? $scope.historical_items.filter((item) => !_.isEmpty(item.state.scenarios)) : []; @@ -154,7 +162,7 @@ angular.module('BE.seed.controller.inventory_detail', []).controller('inventory_ return 0; })[0]; } - $scope.users = users_payload.users; + // $scope.users = users_payload.users; // handle popovers cleared on scrolling [document.getElementsByClassName('ui-view-container')[0], document.getElementById('pin')].forEach((el) => { @@ -503,7 +511,8 @@ angular.module('BE.seed.controller.inventory_detail', []).controller('inventory_ controller: 'update_item_labels_modal_controller', resolve: { inventory_ids: () => [$scope.inventory.view_id], - inventory_type: () => $scope.inventory_type + inventory_type: () => $scope.inventory_type, + is_ali_root: () => $scope.menu.user.is_ali_root } }); modalInstance.result.then( @@ -542,7 +551,8 @@ angular.module('BE.seed.controller.inventory_detail', []).controller('inventory_ resolve: { inventory_ids: () => [$scope.inventory.view_id], current_cycle: () => $scope.cycle, - cycles: () => cycle_service.get_cycles().then((result) => result.cycles) + cycles: () => cycle_service.get_cycles().then((result) => result.cycles), + user: () => $scope.menu.user } }); }; @@ -698,20 +708,24 @@ angular.module('BE.seed.controller.inventory_detail', []).controller('inventory_ }; $scope.match_merge_link_record = () => { - let new_view_id; if ($scope.inventory_type === 'properties') { - inventory_service.property_match_merge_link($scope.inventory.view_id).then((result) => { - new_view_id = result.view_id; - notify_merges_and_links(result); - if (new_view_id) reload_with_view_id(new_view_id); - }); + match_merge_link_fn = inventory_service.property_match_merge_link } else if ($scope.inventory_type === 'taxlots') { - inventory_service.taxlot_match_merge_link($scope.inventory.view_id).then((result) => { - new_view_id = result.view_id; - notify_merges_and_links(result); - if (new_view_id) reload_with_view_id(new_view_id); - }); + match_merge_link_fn = inventory_service.taxlot_match_merge_link } + + match_merge_link_fn($scope.inventory.view_id) + .then(result => { + notify_merges_and_links(result); + new_view_id = result.view_id; + if (new_view_id) reload_with_view_id(new_view_id); + }) + .catch(result => { + Notification.error({ + message: result.data.message, + delay: 10000 + }); + }); }; $scope.open_match_merge_link_warning_modal = (accept_action, trigger) => { diff --git a/seed/static/seed/js/controllers/inventory_detail_meters_controller.js b/seed/static/seed/js/controllers/inventory_detail_meters_controller.js index f540168b1b..d08420a5f2 100644 --- a/seed/static/seed/js/controllers/inventory_detail_meters_controller.js +++ b/seed/static/seed/js/controllers/inventory_detail_meters_controller.js @@ -17,7 +17,7 @@ angular.module('BE.seed.controller.inventory_detail_meters', []).controller('inv 'property_meter_usage', 'spinner_utility', 'urls', - 'user_service', + // 'user_service', 'organization_payload', // eslint-disable-next-line func-names function ( @@ -35,7 +35,7 @@ angular.module('BE.seed.controller.inventory_detail_meters', []).controller('inv property_meter_usage, spinner_utility, urls, - user_service, + // user_service, organization_payload ) { spinner_utility.show(); @@ -61,7 +61,7 @@ angular.module('BE.seed.controller.inventory_detail_meters', []).controller('inv resetSelections(); - const deleteButton = ''; + const deleteButton = ''; $scope.meterGridOptions = { data: 'sorted_meters', diff --git a/seed/static/seed/js/controllers/inventory_detail_sensors_controller.js b/seed/static/seed/js/controllers/inventory_detail_sensors_controller.js index 5953b49f3e..cd514b411d 100644 --- a/seed/static/seed/js/controllers/inventory_detail_sensors_controller.js +++ b/seed/static/seed/js/controllers/inventory_detail_sensors_controller.js @@ -127,8 +127,8 @@ angular.module('BE.seed.controller.inventory_detail_sensors', []).controller('in enableHiding: false, cellTemplate: '
' + - '' + - '' + + '' + + '' + '
', enableColumnMenu: false, enableColumnMoving: false, diff --git a/seed/static/seed/js/controllers/inventory_detail_settings_controller.js b/seed/static/seed/js/controllers/inventory_detail_settings_controller.js index a21b7e08ff..9acf1f877f 100644 --- a/seed/static/seed/js/controllers/inventory_detail_settings_controller.js +++ b/seed/static/seed/js/controllers/inventory_detail_settings_controller.js @@ -56,6 +56,9 @@ angular.module('BE.seed.controller.inventory_detail_settings', []).controller('i _.forEach($scope.gridApi.grid.rows, (row) => { if (row.entity.visible === false) row.setSelected(false); else row.setSelected(true); + if ($scope.menu.user.organization.user_role === 'viewer') { + row.enableSelection = false; + } }); }); }); @@ -150,8 +153,8 @@ angular.module('BE.seed.controller.inventory_detail_settings', []).controller('i const element = angular.element(selector)[0]; if (element) height += element.offsetHeight; }); - angular.element('#grid-container').css('height', `calc(100vh - ${height + 2}px)`); - angular.element('#grid-container > div').css('height', `calc(100vh - ${height + 4}px)`); + angular.element('#grid-container').css('height', `calc(100vh - ${height}px)`); + angular.element('#grid-container > div').css('height', `calc(100vh - ${height + 2}px)`); $scope.gridApi.core.handleWindowResize(); }; @@ -271,7 +274,7 @@ angular.module('BE.seed.controller.inventory_detail_settings', []).controller('i gridMenuShowHideColumns: false, minRowsToShow: 30, rowTemplate: - '
', + '
', columnDefs: [ { name: 'displayName', @@ -289,6 +292,7 @@ angular.module('BE.seed.controller.inventory_detail_settings', []).controller('i gridApi.selection.on.rowSelectionChanged($scope, rowSelectionChanged); gridApi.selection.on.rowSelectionChangedBatch($scope, rowSelectionChanged); + gridApi.dragndrop.setDragDisabled($scope.menu.user.organization.user_role === 'viewer'); gridApi.draggableRows.on.rowDropped($scope, modified_service.setModified); _.delay($scope.updateHeight, 150); diff --git a/seed/static/seed/js/controllers/inventory_detail_timeline_controller.js b/seed/static/seed/js/controllers/inventory_detail_timeline_controller.js index ad4a8805e2..8f4403510c 100644 --- a/seed/static/seed/js/controllers/inventory_detail_timeline_controller.js +++ b/seed/static/seed/js/controllers/inventory_detail_timeline_controller.js @@ -14,7 +14,18 @@ angular.module('BE.seed.controller.inventory_detail_timeline', []).controller('i 'users_payload', 'organization_payload', // eslint-disable-next-line func-names - function ($scope, $stateParams, $timeout, uiGridConstants, cycles, events, inventory_payload, urls, users_payload, organization_payload) { + function ( + $scope, + $stateParams, + $timeout, + uiGridConstants, + cycles, + events, + inventory_payload, + urls, + users_payload, + organization_payload + ) { $scope.organization = organization_payload.organization; $scope.static_url = urls.static_url; $scope.cycleNameById = cycles.cycles.reduce((acc, curr) => ({ ...acc, [curr.id]: curr.name }), {}); diff --git a/seed/static/seed/js/controllers/inventory_list_controller.js b/seed/static/seed/js/controllers/inventory_list_controller.js index 5df874312b..747228c707 100644 --- a/seed/static/seed/js/controllers/inventory_list_controller.js +++ b/seed/static/seed/js/controllers/inventory_list_controller.js @@ -546,6 +546,17 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li }); } + $scope.show_access_level_instances = true; + $scope.toggle_access_level_instances = () => { + $scope.show_access_level_instances = !$scope.show_access_level_instances; + $scope.gridOptions.columnDefs.forEach((col) => { + if (col.group === 'access_level_instance') { + col.visible = $scope.show_access_level_instances; + } + }); + $scope.gridApi.core.refresh(); + }; + $scope.loadLabelsForFilter = ( query // Find all labels associated with the current cycle. ) => _.filter($scope.labels, (lbl) => { @@ -577,7 +588,8 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li controller: 'update_item_labels_modal_controller', resolve: { inventory_ids: () => selectedViewIds, - inventory_type: () => $scope.inventory_type + inventory_type: () => $scope.inventory_type, + is_ali_root: () => $scope.menu.user.is_ali_root } }); modalInstance.result.then(() => { @@ -787,6 +799,27 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li return _.defaults(col, options, defaults); }); + // Add access level instances to grid + for (const level of $scope.organization.access_level_names.reverse().slice(0, -1)) { + $scope.columns.unshift({ + name: level, + displayName: level, + group: 'access_level_instance', + enableColumnMenu: true, + enableColumnMoving: false, + enableColumnResizing: true, + enableFiltering: true, + enableHiding: true, + enableSorting: true, + enablePinning: false, + exporterSuppressExport: true, + pinnedLeft: true, + visible: true, + width: 100, + cellClass: 'ali-cell', + headerCellClass: 'ali-header' + }); + } // The meters_exist_indicator column is only applicable to properties if ($stateParams.inventory_type === 'properties') { $scope.columns.unshift( @@ -1032,17 +1065,11 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li // Data const processData = (data) => { if (_.isUndefined(data)) data = $scope.data; - const visibleColumns = _.map($scope.columns, 'name').concat([ - '$$treeLevel', - 'notes_count', - 'meters_exist_indicator', - 'merged_indicator', - 'id', - 'property_state_id', - 'property_view_id', - 'taxlot_state_id', - 'taxlot_view_id' - ]); + const visibleColumns = [ + ..._.map($scope.columns, 'name'), + ...['$$treeLevel', 'notes_count', 'meters_exist_indicator', 'merged_indicator', 'id', 'property_state_id', 'property_view_id', 'taxlot_state_id', 'taxlot_view_id'], + ...$scope.organization.access_level_names + ]; const columnsToAggregate = _.filter($scope.columns, 'treeAggregationType').reduce((obj, col) => { obj[col.name] = col.treeAggregationType; @@ -1522,6 +1549,9 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li case 'open_show_populated_columns_modal': $scope.open_show_populated_columns_modal(); break; + case 'toggle_access_level_instances': + $scope.toggle_access_level_instances(); + break; case 'select_all': $scope.select_all(); break; @@ -1569,7 +1599,8 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li resolve: { inventory_ids: () => ($scope.inventory_type === 'properties' ? selectedViewIds : []), cycles: () => cycles.cycles, - current_cycle: () => $scope.cycle.selected_cycle + current_cycle: () => $scope.cycle.selected_cycle, + user: () => $scope.menu.user } }); modalInstance.result.then( @@ -1611,7 +1642,15 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li ($state, $stateParams, inventory_service) => (record.inventory_type === 'properties' ? inventory_service.get_property(record.view_id) : inventory_service.get_taxlot(record.view_id)) ], organization_payload: () => organization_payload, - notes: ['note_service', (note_service) => note_service.get_notes($scope.organization.id, record.inventory_type, record.view_id)] + notes: ['note_service', (note_service) => note_service.get_notes($scope.organization.id, record.inventory_type, record.view_id)], + auth_payload: [ + 'auth_service', + 'user_service', + (auth_service, user_service) => { + const organization_id = user_service.get_organization().id; + return auth_service.is_authorized(organization_id, ['requires_member']); + } + ] } }) .result.then((notes_count) => { @@ -1620,12 +1659,13 @@ angular.module('BE.seed.controller.inventory_list', []).controller('inventory_li }; function currentColumns() { - // Save all columns except first 3 + // Save all columns except first 3 and Access Level Instances let gridCols = _.filter( $scope.gridApi.grid.columns, (col) => !_.includes(['treeBaseRowHeaderCol', 'selectionRowHeaderCol', 'notes_count', 'meters_exist_indicator', 'merged_indicator', 'id', 'labels'], col.name) && col.visible && - !col.colDef.is_derived_column + !col.colDef.is_derived_column && + col.colDef.group !== 'access_level_instance' ); // Ensure pinned ordering first diff --git a/seed/static/seed/js/controllers/inventory_list_legacy_controller.js b/seed/static/seed/js/controllers/inventory_list_legacy_controller.js index e65b62ad44..82ab0d00a6 100644 --- a/seed/static/seed/js/controllers/inventory_list_legacy_controller.js +++ b/seed/static/seed/js/controllers/inventory_list_legacy_controller.js @@ -363,7 +363,8 @@ angular.module('BE.seed.controller.inventory_list_legacy', []).controller('inven }), 'taxlot_state_id' ), - inventory_type: () => $scope.inventory_type + inventory_type: () => $scope.inventory_type, + is_ali_root: () => $scope.menu.user.is_ali_root, } }); }; @@ -1223,7 +1224,15 @@ angular.module('BE.seed.controller.inventory_list_legacy', []).controller('inven ($state, $stateParams, inventory_service) => (record.inventory_type === 'properties' ? inventory_service.get_property(record.view_id) : inventory_service.get_taxlot(record.view_id)) ], organization_payload: () => organization_payload, - notes: ['note_service', (note_service) => note_service.get_notes($scope.organization.id, record.inventory_type, record.view_id)] + notes: ['note_service', (note_service) => note_service.get_notes($scope.organization.id, record.inventory_type, record.view_id)], + auth_payload: [ + 'auth_service', + 'user_service', + (auth_service, user_service) => { + const organization_id = user_service.get_organization().id; + return auth_service.is_authorized(organization_id, ['requires_member']); + } + ] } }) .result.then((notes_count) => { diff --git a/seed/static/seed/js/controllers/inventory_settings_controller.js b/seed/static/seed/js/controllers/inventory_settings_controller.js index 6704447b49..9c781e5569 100644 --- a/seed/static/seed/js/controllers/inventory_settings_controller.js +++ b/seed/static/seed/js/controllers/inventory_settings_controller.js @@ -58,14 +58,14 @@ angular.module('BE.seed.controller.inventory_settings', []).controller('inventor gridMenuShowHideColumns: false, minRowsToShow: 30, rowTemplate: - '
', + '
', columnDefs: [ { name: 'pinnedLeft', displayName: '', cellTemplate: '
' + - ' ' + + ' ' + ' ' + ' ' + '
', @@ -90,6 +90,7 @@ angular.module('BE.seed.controller.inventory_settings', []).controller('inventor gridApi.selection.on.rowSelectionChanged($scope, rowSelectionChanged); gridApi.selection.on.rowSelectionChangedBatch($scope, rowSelectionChanged); + gridApi.dragndrop.setDragDisabled($scope.menu.user.organization.user_role === 'viewer'); gridApi.draggableRows.on.rowDropped($scope, modified_service.setModified); _.delay($scope.updateHeight, 150); @@ -107,6 +108,9 @@ angular.module('BE.seed.controller.inventory_settings', []).controller('inventor if (row.entity.visible !== false) { row.setSelected(true); } + if ($scope.menu.user.organization.user_role === 'viewer') { + row.enableSelection = false; + } }); }; @@ -189,7 +193,7 @@ angular.module('BE.seed.controller.inventory_settings', []).controller('inventor $scope.showSharedBuildings = shared_fields_payload.show_shared_buildings; - var rowSelectionChanged = () => { + const rowSelectionChanged = () => { _.forEach($scope.gridApi.grid.rows, (row) => { row.entity.visible = row.isSelected; if (!row.isSelected && row.entity.pinnedLeft) row.entity.pinnedLeft = false; @@ -204,8 +208,8 @@ angular.module('BE.seed.controller.inventory_settings', []).controller('inventor const element = angular.element(selector)[0]; if (element) height += element.offsetHeight; }); - angular.element('#grid-container').css('height', `calc(100vh - ${height + 2}px)`); - angular.element('#grid-container > div').css('height', `calc(100vh - ${height + 4}px)`); + angular.element('#grid-container').css('height', `calc(100vh - ${height}px)`); + angular.element('#grid-container > div').css('height', `calc(100vh - ${height + 2}px)`); $scope.gridApi.core.handleWindowResize(); }; diff --git a/seed/static/seed/js/controllers/mapping_controller.js b/seed/static/seed/js/controllers/mapping_controller.js index d87f75573a..36098bb89f 100644 --- a/seed/static/seed/js/controllers/mapping_controller.js +++ b/seed/static/seed/js/controllers/mapping_controller.js @@ -114,6 +114,7 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' $scope.initialize_mappings(); $scope.updateInventoryTypeDropdown(); $scope.updateColDuplicateStatus(); + $scope.updateColIsDisallowedCreation(); $scope.updateDerivedColumnMatchStatus(); }) .catch(() => { @@ -125,6 +126,7 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' $scope.initialize_mappings(); $scope.updateInventoryTypeDropdown(); $scope.updateColDuplicateStatus(); + $scope.updateColIsDisallowedCreation(); $scope.updateDerivedColumnMatchStatus(); } }; @@ -319,6 +321,7 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' } }); $scope.updateColDuplicateStatus(); + $scope.updateColIsDisallowedCreation(); $scope.updateDerivedColumnMatchStatus(); }; $scope.updateInventoryTypeDropdown = () => { @@ -368,6 +371,7 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' if (!checkingMultiple) { $scope.updateColDuplicateStatus(); + $scope.updateColIsDisallowedCreation(); $scope.updateDerivedColumnMatchStatus(); } }; @@ -398,6 +402,22 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' $scope.duplicates_present = duplicates_present; }; + $scope.updateColIsDisallowedCreation = () => { + if (window.BE.is_ali_root) { + return; + } + + const existing_columns = [ + ...$scope.mappable_property_columns.map((col) => col.display_name), + ...$scope.organization.access_level_names + ]; + $scope.mappings.forEach((col) => { + col.is_disallowed_creation = !!col.suggestion && !existing_columns.some((existing_col) => existing_col === col.suggestion); + }); + + $scope.disallowed_creation_present = $scope.mappings.some((col) => col.is_disallowed_creation); + }; + // Verify there are not any suggested Column names that match an existing Derived Column name $scope.updateDerivedColumnMatchStatus = () => { const suggestions = $scope.mappings.map((col) => col.suggestion); @@ -468,6 +488,7 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' if (changed) $scope.change(col, true); }); $scope.updateColDuplicateStatus(); + $scope.updateColIsDisallowedCreation(); $scope.updateDerivedColumnMatchStatus(); }; @@ -598,21 +619,19 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' /** * empty_units_present: used to disable or enable the 'Map Your Data' button if any units are empty */ - $scope.empty_units_present = () => { - return $scope.mappings.some((field) => ( - !field.isOmitted && + $scope.empty_units_present = () => $scope.mappings.some((field) => ( + !field.isOmitted && field.suggestion_table_name === 'PropertyState' && field.from_units === null && ($scope.is_area_column(field) || $scope.is_eui_column(field)) - )) - }; + )); /** * empty_fields_present: used to disable or enable the 'show & review * mappings' button. No warning associated as users "aren't done" listing their mapping settings. */ const suggestions_not_provided_yet = () => { - const non_omitted_mappings = $scope.mappings.filter(m => !m.isOmitted) + const non_omitted_mappings = $scope.mappings.filter((m) => !m.isOmitted); const no_suggestion_value = Boolean(_.find(non_omitted_mappings, { suggestion: undefined })); const no_suggestion_table_name = Boolean(_.find(non_omitted_mappings, { suggestion_table_name: undefined })); @@ -627,6 +646,7 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' $scope.empty_units_present() || !$scope.required_property_fields_present() || !$scope.required_taxlot_fields_present() || + $scope.disallowed_creation_present || suggestions_not_provided_yet() || $scope.derived_column_match; @@ -653,10 +673,15 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' * after saving column mappings, deletes unmatched buildings */ $scope.remap_buildings = () => { - $scope.import_file.progress = 0; - $scope.save_mappings = true; - $scope.review_mappings = true; - mapping_service.save_mappings($scope.import_file.id, $scope.get_mappings()).then(() => { + mapping_service.save_mappings($scope.import_file.id, $scope.get_mappings()).then((mapping_result) => { + if (mapping_result.status === 'error' || mapping_result.status === 'warning') { + return; + } + + $scope.import_file.progress = 0; + $scope.save_mappings = true; + $scope.review_mappings = true; + // start re-mapping mapping_service.remap_buildings($scope.import_file.id).then((data) => { if (data.status === 'error' || data.status === 'warning') { @@ -741,6 +766,28 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' $scope.propertiesGridOptions = angular.copy(gridOptions); $scope.propertiesGridOptions.data = _.map(data.properties, (prop) => _.defaults(prop, prop.extra_data)); $scope.propertiesGridOptions.columnDefs = $scope.property_columns; + // Add access level instances to grid + ['raw_access_level_instance_error', ...$scope.organization.access_level_names].reverse().forEach((level) => { + $scope.propertiesGridOptions.columnDefs.unshift({ + name: level, + displayName: level, + group: 'access_level_instance', + enableColumnMenu: true, + enableColumnMoving: false, + enableColumnResizing: true, + enableFiltering: true, + enableHiding: true, + enableSorting: true, + enablePinning: false, + exporterSuppressExport: true, + pinnedLeft: true, + visible: true, + width: 100, + cellClass: 'ali-cell', + headerCellClass: 'ali-header' + }); + }); + $scope.taxlotsGridOptions = angular.copy(gridOptions); $scope.taxlotsGridOptions.data = _.map(data.tax_lots, (taxlot) => _.defaults(taxlot, taxlot.extra_data)); $scope.taxlotsGridOptions.columnDefs = $scope.taxlot_columns; @@ -853,6 +900,7 @@ angular.module('BE.seed.controller.mapping', []).controller('mapping_controller' } $scope.updateColDuplicateStatus(); + $scope.updateColIsDisallowedCreation(); $scope.updateDerivedColumnMatchStatus(); $scope.updateInventoryTypeDropdown(); }; diff --git a/seed/static/seed/js/controllers/members_controller.js b/seed/static/seed/js/controllers/members_controller.js index eb491d16c1..47c67c5b6a 100644 --- a/seed/static/seed/js/controllers/members_controller.js +++ b/seed/static/seed/js/controllers/members_controller.js @@ -11,9 +11,11 @@ angular.module('BE.seed.controller.members', []).controller('members_controller' 'auth_service', 'organization_service', 'user_profile_payload', + 'access_level_tree', 'urls', + 'Notification', // eslint-disable-next-line func-names - function ($scope, $uibModal, users_payload, organization_payload, auth_payload, auth_service, organization_service, user_profile_payload, urls) { + function ($scope, $uibModal, users_payload, organization_payload, auth_payload, auth_service, organization_service, user_profile_payload, access_level_tree, urls, Notification) { $scope.ownerRoles = ['owner', 'member', 'viewer']; $scope.memberRoles = ['member', 'viewer']; $scope.users = users_payload.users; @@ -21,6 +23,100 @@ angular.module('BE.seed.controller.members', []).controller('members_controller' $scope.filter_params = {}; $scope.auth = auth_payload.auth; $scope.user_profile = user_profile_payload; + $scope.access_level_names = access_level_tree.access_level_names; + $scope.user_id_being_edited = null; + $scope.user_edits = {}; + + /* Build out access_level_instances_by_depth recursively */ + const access_level_instances_by_depth = {}; + const calculate_access_level_instances_by_depth = (tree, depth = 1) => { + if (tree === undefined) return; + if (access_level_instances_by_depth[depth] === undefined) access_level_instances_by_depth[depth] = []; + for (const ali of tree) { + access_level_instances_by_depth[depth].push({ id: ali.id, name: ali.data.name }); + calculate_access_level_instances_by_depth(ali.children, depth + 1); + } + }; + calculate_access_level_instances_by_depth(access_level_tree.access_level_tree, 0); + + // Result of clicking "edit" + $scope.begin_user_edits = (user) => { + // set edited user and default edits + $scope.user_id_being_edited = user.user_id; + $scope.user_edits = { + "access_level_instance": { + "id": user.access_level_instance_id, + "name": user.access_level_instance_name + }, + "access_level": user.access_level, + "role": user.role, + }; + + // the the possible access_level_instances at that level + access_level_idx = $scope.access_level_names.findIndex(x => x == $scope.user_edits["access_level"]); + $scope.access_level_instances = access_level_instances_by_depth[access_level_idx]; + } + + // Result of pick a new al. sets ali options. + $scope.change_access_level_instance_options = () => { + access_level_idx = $scope.access_level_names.findIndex(x => x == $scope.user_edits["access_level"]); + $scope.access_level_instances = access_level_instances_by_depth[access_level_idx]; + $scope.user_edits["access_level_instance"] = null; + } + + // user user edits + $scope.save_user_edits = () => { + if ($scope.user_edits["access_level_instance"] === null){ + Notification.error('Must select an ali.'); + return; + } + if($scope.user_edits.role == "owner" && $scope.user_edits.access_level != $scope.access_level_names[0]){ + Notification.error('Owners must be in the root.'); + return; + } + + // update user + user = $scope.users.find(x => x.user_id == $scope.user_id_being_edited); + $scope.update_user(user, $scope.user_edits) + + user.role = $scope.user_edits.role + user.access_level_instance_id = $scope.user_edits.access_level_instance.id + user.access_level_instance_name = $scope.user_edits.access_level_instance.name + user.access_level = $scope.user_edits.access_level + + // reset user edits + $scope.user_id_being_edited = null; + $scope.user_edits = {}; + } + /** + * update_user: updates a users role and access level instance + */ + $scope.update_user = (user, user_edits) => { + // 1. update role + // 2. update ali + organization_service.update_role(user.user_id, $scope.org.id, user_edits.role) + .then(() => { + refreshRoleStatus(); + return organization_service.update_ali(user.user_id, $scope.org.id, user_edits.access_level_instance.id) + }) + .catch((data) => { + $scope.$emit('app_error', data); + }) + } + + $scope.cancel_user_edits = () => { + $scope.user_id_being_edited = null; + $scope.user_edits = {}; + } + + $scope.get_roles = (user) => { + user_in_root = user.access_level == $scope.org.access_level_names[0] + if(user_in_root){ + return ['owner', 'member', 'viewer'] + } else{ + return ['member', 'viewer'] + } + } /** * remove_member: removes a user from the org @@ -41,20 +137,6 @@ angular.module('BE.seed.controller.members', []).controller('members_controller' }); }; - /** - * saves the changed role for the user - * @param {obj} user - */ - $scope.update_role = (user) => { - organization_service - .update_role(user.user_id, $scope.org.id, user.role) - .then((data) => { - refreshRoleStatus(); - }) - .catch((data) => { - $scope.$emit('app_error', data); - }); - }; /** * new_member_modal open an AngularUI modal to add/invite a new member @@ -64,7 +146,9 @@ angular.module('BE.seed.controller.members', []).controller('members_controller' templateUrl: `${urls.static_url}seed/partials/new_member_modal.html`, controller: 'new_member_modal_controller', resolve: { - organization: () => $scope.org + organization: () => $scope.org, + access_level_tree: () => access_level_tree.access_level_tree, + level_names: () => access_level_tree.access_level_names } }); modalInstance.result.then( diff --git a/seed/static/seed/js/controllers/menu_controller.js b/seed/static/seed/js/controllers/menu_controller.js index b3e728bffd..27bca10e65 100644 --- a/seed/static/seed/js/controllers/menu_controller.js +++ b/seed/static/seed/js/controllers/menu_controller.js @@ -163,11 +163,10 @@ angular.module('BE.seed.controller.menu', []).controller('menu_controller', [ * sets the users primary organization, reloads/refreshed the page * @param {obj} org */ - $scope.set_user_org = (org) => { + $scope.set_user_org = async (org) => { $scope.mouseout_org(); - user_service.set_organization(org); + await user_service.set_organization(org); $scope.menu.user.organization = org; - console.log($scope.menu.user.organization); $state.reload(); init(); }; @@ -240,6 +239,9 @@ angular.module('BE.seed.controller.menu', []).controller('menu_controller', [ $scope.menu.user.organizations = data.organizations; // get the default org for the user $scope.menu.user.organization = _.find(data.organizations, { id: _.toInteger(user_service.get_organization().id) }); + $scope.menu.user.access_level_instance_name = user_service.get_access_level_instance().name; + $scope.menu.user.is_ali_root = user_service.get_access_level_instance().is_ali_root; + $scope.menu.user.is_ali_leaf = user_service.get_access_level_instance().is_ali_leaf; set_auth($scope.menu.user.organization.id); }) .catch((error) => { diff --git a/seed/static/seed/js/controllers/merge_modal_controller.js b/seed/static/seed/js/controllers/merge_modal_controller.js index 395dd738fc..50f7069961 100644 --- a/seed/static/seed/js/controllers/merge_modal_controller.js +++ b/seed/static/seed/js/controllers/merge_modal_controller.js @@ -133,8 +133,8 @@ angular.module('BE.seed.controller.merge_modal', []).controller('merge_modal_con $scope.close(); }, (err) => { - $log.error(err); - Notification.error('Failed to merge properties'); + $log.error(err.data.message); + Notification.error('Failed to merge properties: ' + err.data.message); } ) .finally(() => { diff --git a/seed/static/seed/js/controllers/new_member_modal_controller.js b/seed/static/seed/js/controllers/new_member_modal_controller.js index 91e7776df1..7a0c93cea4 100644 --- a/seed/static/seed/js/controllers/new_member_modal_controller.js +++ b/seed/static/seed/js/controllers/new_member_modal_controller.js @@ -6,28 +6,51 @@ angular.module('BE.seed.controller.new_member_modal', []).controller('new_member '$scope', '$uibModalInstance', 'organization', + 'ah_service', 'user_service', '$timeout', '$translate', + 'access_level_tree', + 'level_names', // eslint-disable-next-line func-names - function ($scope, $uibModalInstance, organization, user_service, $timeout, $translate) { - $scope.roles = [ - { - name: $translate.instant('Owner'), - value: 'owner' - }, - { - name: $translate.instant('Member'), - value: 'member' - }, - { - name: $translate.instant('Viewer'), - value: 'viewer' + function ($scope, $uibModalInstance, organization, ah_service, user_service, $timeout, $translate, access_level_tree, level_names) { + $scope.access_level_tree = access_level_tree; + $scope.level_names = level_names; + $scope.level_name_index = null; + $scope.potential_level_instances = []; + $scope.error_message = null; + + const access_level_instances_by_depth = ah_service.calculate_access_level_instances_by_depth(access_level_tree); + + $scope.change_selected_level_index = () => { + const new_level_instance_depth = parseInt($scope.level_name_index, 10) + 1; + $scope.potential_level_instances = access_level_instances_by_depth[new_level_instance_depth]; + }; + + OWNER = { + name: $translate.instant('Owner'), + value: 'owner' + } + MEMBER = { + name: $translate.instant('Member'), + value: 'member' + } + VIEWER = { + name: $translate.instant('Viewer'), + value: 'viewer' + } + $scope.get_roles = () => { + const level_instance_depth = parseInt($scope.level_name_index, 10) + 1; + if(level_instance_depth == 1){ + return [OWNER, MEMBER, VIEWER] + } else{ + return [MEMBER, VIEWER] } - ]; + } + $scope.user = { organization, - role: $scope.roles[1] + role: MEMBER }; /** @@ -36,7 +59,6 @@ angular.module('BE.seed.controller.new_member_modal', []).controller('new_member $scope.submit_form = () => { // make `role` a string const u = _.cloneDeep($scope.user); - u.role = u.role.value; user_service.add(u).then( () => { @@ -44,6 +66,7 @@ angular.module('BE.seed.controller.new_member_modal', []).controller('new_member }, (data) => { $scope.$emit('app_error', data); + $scope.error_message = data.data.message; } ); }; diff --git a/seed/static/seed/js/controllers/notes_controller.js b/seed/static/seed/js/controllers/notes_controller.js index 27b2491a0b..9785a04723 100644 --- a/seed/static/seed/js/controllers/notes_controller.js +++ b/seed/static/seed/js/controllers/notes_controller.js @@ -12,12 +12,14 @@ angular.module('BE.seed.controller.notes', []).controller('notes_controller', [ 'inventory_payload', 'organization_payload', 'notes', + 'auth_payload', // eslint-disable-next-line func-names - function ($scope, $uibModalInstance, urls, note_service, inventory_type, view_id, inventory_payload, organization_payload, notes) { + function ($scope, $uibModalInstance, urls, note_service, inventory_type, view_id, inventory_payload, organization_payload, notes, auth_payload) { $scope.inventory_type = inventory_type; $scope.notes = notes; $scope.org_id = organization_payload.organization.org_id; $scope.urls = urls; + $scope.auth = auth_payload.auth; $scope.inventory_name = note_service.inventory_display_name(inventory_type === 'properties' ? 'property' : 'taxlot', organization_payload.organization, inventory_payload.state); diff --git a/seed/static/seed/js/controllers/organization_access_level_tree_controller.js b/seed/static/seed/js/controllers/organization_access_level_tree_controller.js new file mode 100644 index 0000000000..66a0c1166c --- /dev/null +++ b/seed/static/seed/js/controllers/organization_access_level_tree_controller.js @@ -0,0 +1,147 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.controller.organization_access_level_tree', []) + .controller('organization_access_level_tree_controller', [ + '$scope', + '$uibModal', + 'organization_payload', + 'auth_payload', + 'access_level_tree', + 'urls', + '$window', + 'spinner_utility', + // eslint-disable-next-line func-names + function ( + $scope, + $uibModal, + organization_payload, + auth_payload, + access_level_tree, + urls, + $window, + spinner_utility + ) { + $scope.org = organization_payload.organization; + $scope.static_url = urls.static_url; + // AUTH: only owners can CRUD Access Level Tree and ALIs + // members and viewers can see their part of the hierarchy - read-only + $scope.auth = auth_payload.auth; + $scope.btnText = 'Expand Help'; + $scope.access_level_tree = access_level_tree.access_level_tree; + $scope.access_level_names = access_level_tree.access_level_names; + + $scope.accordionsCollapsed = true; + $scope.collapseAccordions = (collapseAll) => { + $scope.accordionsCollapsed = collapseAll; + const action = collapseAll ? 'hide' : 'show'; + $('.level-collapse').collapse(action); + }; + + $scope.changeText = (btnText) => { + if (btnText === 'Collapse Help') { + $scope.btnText = 'Expand Help'; + } else { + $scope.btnText = 'Collapse Help'; + } + }; + + $scope.open_add_level_modal = () => { + $uibModal.open({ + templateUrl: `${urls.static_url}seed/partials/organization_add_access_level_modal.html`, + controller: 'organization_add_access_level_modal_controller', + backdrop: 'static', + resolve: { + org_id: () => $scope.org.id, + current_access_level_names: () => $scope.access_level_names, + access_level_tree: () => $scope.access_level_tree, + } + }).result.then(() => { + spinner_utility.show(); + $window.location.reload(); + }); + }; + + $scope.open_add_level_instance_modal = () => { + $uibModal.open({ + templateUrl: `${urls.static_url}seed/partials/organization_add_access_level_instance_modal.html`, + controller: 'organization_add_access_level_instance_modal_controller', + backdrop: 'static', + resolve: { + org_id: () => $scope.org.id, + level_names: () => $scope.access_level_names, + access_level_tree: () => $scope.access_level_tree + } + }).result.then(() => { + spinner_utility.show(); + $window.location.reload(); + }); + }; + + $scope.open_upload_al_instances_modal = () => { + const step = 20; // this is the step that corresponds to uploading access levels + $uibModal.open({ + templateUrl: `${urls.static_url}seed/partials/data_upload_modal.html`, + controller: 'data_upload_modal_controller', + backdrop: 'static', + resolve: { + cycles: () => [], + step: () => step, + dataset: () => null, + organization: () => $scope.menu.user.organization + } + }).result.finally(() => { + $window.location.reload(); + }); + }; + + $scope.open_delete_al_instance_modal = (instance_id, instance_name) => { + $uibModal.open({ + templateUrl: `${urls.static_url}seed/partials/organization_delete_access_level_instance_modal.html`, + controller: 'organization_delete_access_level_instance_modal_controller', + backdrop: 'static', + resolve: { + org_id: () => $scope.org.id, + instance_id: () => instance_id, + instance_name: () => instance_name + } + }).result.then(() => { + spinner_utility.show(); + $window.location.reload(); + }); + }; + + $scope.open_delete_al_instance_modal = (instance_id, instance_name) => { + $uibModal.open({ + templateUrl: `${urls.static_url}seed/partials/organization_delete_access_level_instance_modal.html`, + controller: 'organization_delete_access_level_instance_modal_controller', + backdrop: 'static', + resolve: { + org_id: () => $scope.org.id, + instance_id: () => instance_id, + instance_name: () => instance_name + } + }).result.then(() => { + spinner_utility.show(); + $window.location.reload(); + }); + }; + + $scope.open_edit_al_instance_modal = (instance_id, instance_name) => { + $uibModal.open({ + templateUrl: `${urls.static_url}seed/partials/organization_edit_access_level_instance_modal.html`, + controller: 'organization_edit_access_level_instance_modal_controller', + backdrop: 'static', + resolve: { + org_id: () => $scope.org.id, + instance_id: () => instance_id, + instance_name: () => instance_name + } + }).result.then(() => { + spinner_utility.show(); + $window.location.reload(); + }); + }; + } + ]); diff --git a/seed/static/seed/js/controllers/organization_add_access_level_instance_modal_controller.js b/seed/static/seed/js/controllers/organization_add_access_level_instance_modal_controller.js new file mode 100644 index 0000000000..bd47439612 --- /dev/null +++ b/seed/static/seed/js/controllers/organization_add_access_level_instance_modal_controller.js @@ -0,0 +1,57 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.controller.organization_add_access_level_instance_modal', []) + .controller('organization_add_access_level_instance_modal_controller', [ + '$scope', + '$state', + '$uibModalInstance', + 'ah_service', + 'organization_service', + 'org_id', + 'level_names', + 'access_level_tree', + 'Notification', + // eslint-disable-next-line func-names + function ( + $scope, + $state, + $uibModalInstance, + ah_service, + organization_service, + org_id, + level_names, + access_level_tree, + Notification + ) { + $scope.level_names = level_names; + $scope.selected_level_index = null; + $scope.parent = null; + $scope.potential_parents = []; + $scope.new_level_instance_name = ''; + + const access_level_instances_by_depth = ah_service.calculate_access_level_instances_by_depth(access_level_tree); + + $scope.change_selected_level_index = () => { + const new_level_instance_depth = parseInt($scope.selected_level_index, 10); + $scope.potential_parents = access_level_instances_by_depth[new_level_instance_depth]; + $scope.parent = null; + }; + + // attempt to default the access level + if ($scope.level_names.length > 1) { + $scope.selected_level_index = 1; + $scope.change_selected_level_index(); + } + + $scope.create_new_level_instance = () => { + organization_service.create_organization_access_level_instance(org_id, $scope.parent.id, $scope.new_level_instance_name) + .then(() => $uibModalInstance.close()) + .catch((err) => { Notification.error(err); }); + }; + + $scope.cancel = () => { + $uibModalInstance.dismiss('cancel'); + }; + }]); diff --git a/seed/static/seed/js/controllers/organization_add_access_level_modal_controller.js b/seed/static/seed/js/controllers/organization_add_access_level_modal_controller.js new file mode 100644 index 0000000000..8473af73dd --- /dev/null +++ b/seed/static/seed/js/controllers/organization_add_access_level_modal_controller.js @@ -0,0 +1,93 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.controller.organization_add_access_level_modal', []) + .controller('organization_add_access_level_modal_controller', [ + '$scope', + '$state', + '$uibModalInstance', + 'organization_service', + 'org_id', + 'current_access_level_names', + 'access_level_tree', + 'Notification', + // eslint-disable-next-line func-names + function ( + $scope, + $state, + $uibModalInstance, + organization_service, + org_id, + current_access_level_names, + access_level_tree, + Notification + ) { + $scope.new_access_level_names = angular.copy(current_access_level_names); + $scope.is_modified = () => !_.isEqual(current_access_level_names, $scope.new_access_level_names); + $scope.num_alis_to_delete = 0; + $scope.enable_save = true; + + /* + Build out access_level_instances_by_depth recursively + We need this to tell how many alis deleting a level would delete + */ + const access_level_instances_by_depth = {}; + const calculate_access_level_instances_by_depth = function (tree, depth = 1) { + if (tree == undefined) return; + if (access_level_instances_by_depth[depth] == undefined) access_level_instances_by_depth[depth] = []; + tree.forEach((ali) => { + access_level_instances_by_depth[depth].push({ id: ali.id, name: ali.data.name }); + calculate_access_level_instances_by_depth(ali.children, depth + 1); + }); + }; + + const get_num_alis_at_depth = function(depth) { + if (Object.keys(access_level_instances_by_depth).length === 0){ + calculate_access_level_instances_by_depth(access_level_tree, 1); + } + return access_level_instances_by_depth[depth]?.length ?? 0 + } + + // A deleted level may mean deleting part of the tree itself + check_for_deletions = () => { + // if no levels are being deleted, no warning + $scope.enable_save = true; + num_levels_to_delete = current_access_level_names.length - $scope.new_access_level_names.length; + if (num_levels_to_delete <= 0 ) { + return + } + + // Get num alis that will be deleted + depths_to_delete = _.range(current_access_level_names.length-num_levels_to_delete+1, current_access_level_names.length+1) + $scope.num_alis_to_delete = depths_to_delete.reduce((acc, curr) => acc + get_num_alis_at_depth(curr), 0) + + // if no alis are being deleted, no warning + if ($scope.num_alis_to_delete > 0){ + $scope.enable_save = false; + } + }; + + $scope.save_access_level_names = () => { + organization_service.update_organization_access_level_names(org_id, $scope.new_access_level_names) + .then(() => $uibModalInstance.close()) + .catch((err) => { + console.log(err.data.message); + Notification.error(err.data.message); + }); + }; + + $scope.remove_level = () => { + $scope.new_access_level_names.pop(); + check_for_deletions(); + }; + + $scope.add_level = () => { + $scope.new_access_level_names.push(''); + check_for_deletions(); + }; + + $scope.cancel = () => { + $uibModalInstance.dismiss('cancel'); + }; + }]); diff --git a/seed/static/seed/js/controllers/organization_delete_access_level_instance_modal_controller.js b/seed/static/seed/js/controllers/organization_delete_access_level_instance_modal_controller.js new file mode 100644 index 0000000000..8e1d83e3c6 --- /dev/null +++ b/seed/static/seed/js/controllers/organization_delete_access_level_instance_modal_controller.js @@ -0,0 +1,52 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.controller.organization_delete_access_level_instance_modal', []) + .controller('organization_delete_access_level_instance_modal_controller', [ + '$scope', + '$state', + '$uibModalInstance', + 'organization_service', + 'org_id', + 'instance_id', + 'instance_name', + 'spinner_utility', + 'Notification', + function ( + $scope, + $state, + $uibModalInstance, + organization_service, + org_id, + instance_id, + instance_name, + spinner_utility, + Notification + ) { + $scope.instance_id = instance_id; + $scope.level_instance_name = instance_name; + $scope.can_delete_access_level_instance = undefined; + $scope.reasons_why = []; + + spinner_utility.show(); + organization_service.can_delete_access_level_instance(org_id, $scope.instance_id) + .then((res) => { + $scope.can_delete_access_level_instance = res.can_delete; + if (!$scope.can_delete_access_level_instance) { + $scope.reasons_why = res.reasons; + } + }) + .catch((err) => { Notification.error(err); }) + .finally(() => spinner_utility.hide()); + + $scope.delete = () => { + organization_service.delete_access_level_instance(org_id, $scope.instance_id) + .then(() => $uibModalInstance.close()) + .catch((err) => { Notification.error(err); }); + }; + + $scope.cancel = () => { + $uibModalInstance.dismiss('cancel'); + }; + }]); diff --git a/seed/static/seed/js/controllers/organization_edit_access_level_instance_modal_controller.js b/seed/static/seed/js/controllers/organization_edit_access_level_instance_modal_controller.js new file mode 100644 index 0000000000..c999588df0 --- /dev/null +++ b/seed/static/seed/js/controllers/organization_edit_access_level_instance_modal_controller.js @@ -0,0 +1,40 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.controller.organization_edit_access_level_instance_modal', []) + .controller('organization_edit_access_level_instance_modal_controller', [ + '$scope', + '$state', + '$uibModalInstance', + 'organization_service', + 'org_id', + 'instance_id', + 'instance_name', + 'Notification', + // eslint-disable-next-line func-names + function ( + $scope, + $state, + $uibModalInstance, + organization_service, + org_id, + instance_id, + instance_name, + Notification + ) { + $scope.instance_id = instance_id; + $scope.level_instance_name = instance_name; + + $scope.save_if_changed = () => { + if (instance_name === $scope.level_instance_name) $scope.cancel(); + + organization_service.edit_organization_access_level_instance(org_id, $scope.instance_id, $scope.level_instance_name) + .then(() => $uibModalInstance.close()) + .catch((err) => { Notification.error(err); }); + }; + + $scope.cancel = () => { + $uibModalInstance.dismiss('cancel'); + }; + }]); diff --git a/seed/static/seed/js/controllers/portfolio_summary_controller.js b/seed/static/seed/js/controllers/portfolio_summary_controller.js new file mode 100644 index 0000000000..68f07cb08d --- /dev/null +++ b/seed/static/seed/js/controllers/portfolio_summary_controller.js @@ -0,0 +1,1010 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.controller.portfolio_summary', []) + .controller('portfolio_summary_controller', [ + '$scope', + '$state', + '$stateParams', + '$uibModal', + '$window', + 'urls', + 'ah_service', + 'inventory_service', + 'label_service', + 'goal_service', + 'cycles', + 'organization_payload', + 'access_level_tree', + 'auth_payload', + 'property_columns', + 'uiGridConstants', + 'gridUtil', + 'spinner_utility', + // eslint-disable-next-line func-names + function ( + $scope, + $state, + $stateParams, + $uibModal, + $window, + urls, + ah_service, + inventory_service, + label_service, + goal_service, + cycles, + organization_payload, + access_level_tree, + auth_payload, + property_columns, + uiGridConstants, + gridUtil, + spinner_utility + ) { + $scope.organization = organization_payload.organization; + const viewer = $scope.menu.user.organization.user_role === 'viewer'; + $scope.write_permission = ($scope.menu.user.is_ali_root || !$scope.menu.user.is_ali_leaf) && !viewer; + // Ii there a better way to convert string units to displayUnits? + const area_units = $scope.organization.display_units_area.replace('**2', '²'); + const eui_units = $scope.organization.display_units_eui.replace('**2', '²'); + $scope.cycles = cycles.cycles; + $scope.access_level_tree = access_level_tree.access_level_tree; + $scope.level_names = access_level_tree.access_level_names; + const localStorageLabelKey = 'grid.properties.labels'; + $scope.goal = {}; + $scope.columns = property_columns; + $scope.cycle_columns = []; + $scope.area_columns = []; + $scope.eui_columns = []; + const matching_column_names = []; + const table_column_ids = []; + + const initialize_columns = () => { + $scope.columns.forEach((col) => { + const default_display = col.column_name === $scope.organization.property_display_field; + const matching = col.is_matching_criteria; + const area = col.data_type === 'area'; + const eui = col.data_type === 'eui'; + const other = ['property_name', 'property_type', 'year_built'].includes(col.column_name); + + if (default_display || matching || eui || area || other) table_column_ids.push(col.id); + if (eui) $scope.eui_columns.push(col); + if (area) $scope.area_columns.push(col); + if (matching) matching_column_names.push(col.column_name); + }); + }; + initialize_columns(); + + // Can only sort based on baseline or current, not both. In the event of a conflict, use the more recent. + let baseline_first = false; + + const sort_goals = (goals) => goals.sort((a, b) => (a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1)); + // optionally pass a goal name to be set as $scope.goal - used on modal close + const get_goals = (goal_name = false) => { + goal_service.get_goals().then((result) => { + $scope.goals = _.isEmpty(result.goals) ? [] : sort_goals(result.goals); + $scope.goal = goal_name ? + $scope.goals.find((goal) => goal.name === goal_name) : + $scope.goals[0]; + }); + }; + get_goals(); + + const reset_data = () => { + $scope.valid = true; + format_goal_details(); + $scope.refresh_data(); + }; + + // If goal changes, reset grid filters and repopulate ui-grids + $scope.$watch('goal', () => { + if ($scope.gridApi) $scope.reset_sorts_filters(); + $scope.data_valid = false; + if (_.isEmpty($scope.goal)) { + $scope.valid = false; + $scope.summary_valid = false; + } else { + reset_data(); + } + }); + + // selected goal details + const format_goal_details = () => { + $scope.change_selected_level_index(); + const get_column_name = (column_id) => $scope.columns.find((col) => col.id === column_id).displayName; + const get_cycle_name = (cycle_id) => $scope.cycles.find((col) => col.id === cycle_id).name; + const level_name = $scope.level_names[$scope.goal.level_name_index]; + const access_level_instance = $scope.potential_level_instances.find((level) => level.id === $scope.goal.access_level_instance).name; + + $scope.goal_details = [ + ['Baseline Cycle', get_cycle_name($scope.goal.baseline_cycle)], + ['Current Cycle', get_cycle_name($scope.goal.current_cycle)], + [level_name, access_level_instance], + ['Portfolio Target', `${$scope.goal.target_percentage} %`], + ['Area Column', get_column_name($scope.goal.area_column)], + ['Primary EUI', get_column_name($scope.goal.eui_column1)] + ]; + if ($scope.goal.eui_column2) { + $scope.goal_details.push(['Secondary EUI', get_column_name($scope.goal.eui_column2)]); + } + if ($scope.goal.eui_column3) { + $scope.goal_details.push(['Tertiary EUI', get_column_name($scope.goal.eui_column3)]); + } + }; + + // from inventory_list_controller + $scope.columnDisplayByName = {}; + for (const i in $scope.columns) { + $scope.columnDisplayByName[$scope.columns[i].name] = $scope.columns[i].displayName; + } + + const access_level_instances_by_depth = ah_service.calculate_access_level_instances_by_depth($scope.access_level_tree); + + $scope.change_selected_level_index = () => { + const new_level_instance_depth = parseInt($scope.goal.level_name_index, 10) + 1; + $scope.potential_level_instances = access_level_instances_by_depth[new_level_instance_depth]; + }; + + // GOAL EDITOR MODAL + $scope.open_goal_editor_modal = () => { + const modalInstance = $uibModal.open({ + templateUrl: `${urls.static_url}seed/partials/goal_editor_modal.html`, + controller: 'goal_editor_modal_controller', + size: 'lg', + backdrop: 'static', + resolve: { + access_level_tree: () => access_level_tree, + area_columns: () => $scope.area_columns, + auth_payload: () => auth_payload, + cycles: () => $scope.cycles, + eui_columns: () => $scope.eui_columns, + goal: () => $scope.goal, + organization: () => $scope.organization, + write_permission: () => $scope.write_permission + } + }); + + // on modal close + modalInstance.result.then((goal_name) => { + get_goals(goal_name); + }); + }; + + $scope.refresh_data = () => { + $scope.summary_loading = true; + load_summary(); + $scope.load_inventory(1); + }; + + const load_summary = () => { + $scope.show_access_level_instances = true; + $scope.summary_valid = false; + + goal_service.get_portfolio_summary($scope.goal.id).then((result) => { + const summary = result.data; + set_summary_grid_options(summary); + }).then(() => { + $scope.summary_loading = false; + $scope.summary_valid = true; + }); + }; + + $scope.page_change = (page) => { + spinner_utility.show(); + $scope.load_inventory(page); + }; + $scope.load_inventory = (page) => { + $scope.data_loading = true; + + const access_level_instance_id = $scope.goal.access_level_instance; + const combined_result = {}; + const per_page = 50; + const current_cycle = { id: $scope.goal.current_cycle }; + const baseline_cycle = { id: $scope.goal.baseline_cycle }; + // order of cycle property filter is dynamic based on column_sorts + const cycle_priority = baseline_first ? [baseline_cycle, current_cycle] : [current_cycle, baseline_cycle]; + + get_paginated_properties(page, per_page, cycle_priority[0], access_level_instance_id, true, null, $scope.goal.id).then((result0) => { + $scope.inventory_pagination = result0.pagination; + let properties = result0.results; + combined_result[cycle_priority[0].id] = properties; + const property_ids = properties.map((p) => p.id); + + get_paginated_properties(page, per_page, cycle_priority[1], access_level_instance_id, false, property_ids, $scope.goal.id).then((result1) => { + properties = result1.results; + // if result0 returns fewer properties than result1, use result1 for ui-grid config + if (result1.pagination.num_pages > $scope.inventory_pagination.num_pages) { + baseline_first = !baseline_first; + $scope.inventory_pagination = result1.pagination; + } + combined_result[cycle_priority[1].id] = properties; + get_all_labels(); + set_grid_options(combined_result); + }).then(() => { + $scope.data_loading = false; + $scope.data_valid = true; + }); + }); + }; + + const get_paginated_properties = (page, chunk, cycle, access_level_instance_id, include_filters_sorts, include_property_ids = null, goal_id = null) => { + const fn = inventory_service.get_properties; + const [filters, sorts] = include_filters_sorts ? [$scope.column_filters, $scope.column_sorts] : [[], []]; + + return fn( + page, + chunk, + cycle, + undefined, // profile_id + undefined, // include_view_ids + undefined, // exclude_view_ids + true, // save_last_cycle + $scope.organization.id, + true, // include_related + filters, + sorts, + false, // ids_only + table_column_ids.join(), + access_level_instance_id, + include_property_ids, + goal_id // optional param to retrieve goal note details + ); + }; + + const percentage = (a, b) => { + if (!a || b == null) return null; + const value = Math.round(((a - b) / a) * 100); + return Number.isNaN(value) ? null : value; + }; + + // -------------- LABEL LOGIC ------------- + + $scope.max_label_width = 750; + $scope.get_label_column_width = (labels_col, key) => { + if (!$scope.show_full_labels[key]) { + return 30; + } + let maxWidth = 0; + const renderContainer = document.body.getElementsByClassName('ui-grid-render-container-body')[1]; + const col = $scope.gridApi.grid.getColumn(labels_col); + const cells = renderContainer.querySelectorAll(`.${uiGridConstants.COL_CLASS_PREFIX}${col.uid} .ui-grid-cell-contents`); + Array.prototype.forEach.call(cells, (cell) => { + gridUtil.fakeElement(cell, {}, (newElm) => { + const e = angular.element(newElm); + e.attr('style', 'float: left;'); + const width = gridUtil.elementWidth(e); + if (width > maxWidth) { + maxWidth = width; + } + }); + }); + return maxWidth > $scope.max_label_width ? $scope.max_label_width : maxWidth + 2; + }; + + // Expand or contract labels col + $scope.show_full_labels = { baseline: false, current: false }; + $scope.toggle_labels = (labels_col, key) => { + $scope.show_full_labels[key] = !$scope.show_full_labels[key]; + setTimeout(() => { + $scope.gridApi.grid.getColumn(labels_col).width = $scope.get_label_column_width(labels_col, key); + const icon = document.getElementById(`label-header-icon-${key}`); + icon.classList.add($scope.show_full_labels[key] ? 'fa-chevron-circle-left' : 'fa-chevron-circle-right'); + icon.classList.remove($scope.show_full_labels[key] ? 'fa-chevron-circle-right' : 'fa-chevron-circle-left'); + $scope.gridApi.grid.refresh(); + }, 0); + }; + + // retrieve labels for cycle + const get_labels = (key) => { + const cycle = key === 'baseline' ? $scope.goal.baseline_cycle : $scope.goal.current_cycle; + + label_service.get_labels('properties', undefined, cycle).then((current_labels) => { + const labels = _.filter(current_labels, (label) => !_.isEmpty(label.is_applied)); + + // load saved label filter + // const ids = inventory_service.loadSelectedLabels(localStorageLabelKey); + // $scope.selected_labels = _.filter(labels, (label) => _.includes(ids, label.id)); + + if (key === 'baseline') { + $scope.baseline_labels = labels; + $scope.build_labels(key, $scope.baseline_labels); + } else { + $scope.current_labels = labels; + $scope.build_labels(key, $scope.current_labels); + } + }); + }; + const get_all_labels = () => { + get_labels('baseline'); + get_labels('current'); + }; + + // Find labels that should be displayed and organize by applied inventory id + $scope.show_labels_by_inventory_id = { baseline: {}, current: {} }; + $scope.build_labels = (key, labels) => { + $scope.show_labels_by_inventory_id[key] = {}; + for (const n in labels) { + const label = labels[n]; + if (label.show_in_list) { + for (const m in label.is_applied) { + const id = label.is_applied[m]; + const property_id = $scope.property_lookup[id]; + if (!$scope.show_labels_by_inventory_id[key][property_id]) { + $scope.show_labels_by_inventory_id[key][property_id] = []; + } + $scope.show_labels_by_inventory_id[key][property_id].push(label); + } + } + } + }; + + // Builds the html to display labels associated with this row entity + $scope.display_labels = (entity, key) => { + const id = entity.id; + const labels = []; + const titles = []; + if ($scope.show_labels_by_inventory_id[key][id]) { + for (const i in $scope.show_labels_by_inventory_id[key][id]) { + const label = $scope.show_labels_by_inventory_id[key][id][i]; + labels.push('', $scope.show_full_labels[key] ? label.text : '', ''); + titles.push(label.text); + } + } + return ['', labels.join(''), ''].join(''); + }; + + // Build column defs for baseline or current labels + const build_label_col_def = (labels_col, key) => { + const header_cell_template = ``; + const cell_template = `
`; + const width_fn = $scope.gridApi ? $scope.get_label_column_width(labels_col, key) : 30; + + return { + name: labels_col, + displayName: '', + headerCellTemplate: header_cell_template, + cellTemplate: cell_template, + enableColumnMenu: false, + enableColumnMoving: false, + enableColumnResizing: false, + enableFiltering: false, + enableHiding: false, + enableSorting: false, + exporterSuppressExport: true, + // pinnedLeft: true, + visible: true, + width: width_fn, + maxWidth: $scope.max_label_width + }; + }; + + // ------------ DATA TABLE LOGIC --------- + + const set_eui_goal = (baseline, current, property, preferred_columns) => { + // only check defined columns + for (const col of preferred_columns.filter((c) => c)) { + if (baseline && property.baseline_eui == undefined) { + property.baseline_eui = baseline[col.name]; + } + if (current && property.current_eui == undefined) { + property.current_eui = current[col.name]; + } + } + + property.baseline_kbtu = Math.round(property.baseline_sqft * property.baseline_eui) || undefined; + property.current_kbtu = Math.round(property.current_sqft * property.current_eui) || undefined; + property.eui_change = percentage(property.baseline_eui, property.current_eui); + }; + + const format_properties = (properties) => { + const area = $scope.columns.find((c) => c.id === $scope.goal.area_column); + const preferred_columns = [$scope.columns.find((c) => c.id === $scope.goal.eui_column1)]; + if ($scope.goal.eui_column2) preferred_columns.push($scope.columns.find((c) => c.id === $scope.goal.eui_column2)); + if ($scope.goal.eui_column3) preferred_columns.push($scope.columns.find((c) => c.id === $scope.goal.eui_column3)); + + const baseline_cycle_name = $scope.cycles.find((c) => c.id === $scope.goal.baseline_cycle).name; + const current_cycle_name = $scope.cycles.find((c) => c.id === $scope.goal.current_cycle).name; + // some fields span cycles (id, name, type) + // and others are cycle specific (source EUI, sqft) + const current_properties = properties[$scope.goal.current_cycle]; + const baseline_properties = properties[$scope.goal.baseline_cycle]; + const flat_properties = baseline_first ? + [baseline_properties, current_properties].flat() : + [current_properties, baseline_properties].flat(); + + // labels are related to property views, but cross cycles displays based on property + // create a lookup between property_view.id to property.id + $scope.property_lookup = {}; + for (const p of flat_properties) { + $scope.property_lookup[p.property_view_id] = p.id; + } + const unique_ids = [...new Set(flat_properties.map((property) => property.id))]; + const combined_properties = []; + for (const id of unique_ids) { + // find matching properties + const baseline = baseline_properties.find((p) => p.id === id) || {}; + const current = current_properties.find((p) => p.id === id) || {}; + // set accumulator + const property = combine_properties(current, baseline); + // add baseline stats + if (baseline) { + property.baseline_cycle = baseline_cycle_name; + property.baseline_sqft = baseline[area.name]; + } + // add current stats + if (current) { + property.current_cycle = current_cycle_name; + property.current_sqft = current[area.name]; + } + // comparison stats + property.sqft_change = percentage(property.current_sqft, property.baseline_sqft); + set_eui_goal(baseline, current, property, preferred_columns); + combined_properties.push(property); + } + return combined_properties; + }; + + const combine_properties = (current, baseline) => { + // Given 2 properties, find non-null values and combine into a single property (favoring baseline if baseline_first) + const [a, b] = baseline_first ? [baseline, current] : [current, baseline]; + const c = { ...b }; + Object.keys(a).forEach((key) => { + if (a[key] !== null && a[key] !== undefined) { + c[key] = a[key]; + } + }); + return c; + }; + + const apply_defaults = (cols, ...defaults) => { + _.map(cols, (col) => _.defaults(col, ...defaults)); + }; + + const property_column_names = [...new Set( + [ + $scope.organization.property_display_field, + ...matching_column_names, + 'property_name', + 'property_type', + 'year_built' + ] + )]; + + $scope.question_options = [ + { id: 0, value: null }, + { id: 1, value: 'Is this a new construction or acquisition?' }, + { id: 2, value: 'Do you have data to report?' }, + { id: 3, value: 'Is this value correct?' }, + { id: 4, value: 'Are these values correct?' }, + { id: 5, value: 'Other or multiple flags; explain in Additional Notes field' } + ]; + // handle cycle specific columns + const selected_columns = () => { + let cols = property_column_names.map((name) => $scope.columns.find((col) => col.column_name === name)); + const default_baseline = { headerCellClass: 'portfolio-summary-baseline-header', cellClass: 'portfolio-summary-baseline-cell' }; + const default_current = { headerCellClass: 'portfolio-summary-current-header', cellClass: 'portfolio-summary-current-cell' }; + const default_styles = { headerCellFilter: 'translate', minWidth: 75, width: 150 }; + + const baseline_cols = [ + { field: 'baseline_cycle', displayName: 'Cycle' }, + { field: 'baseline_sqft', displayName: `Area (${area_units})`, cellFilter: 'number' }, + { field: 'baseline_eui', displayName: `EUI (${eui_units})`, cellFilter: 'number' }, + // ktbu acts as a derived column. Disable sorting filtering + { + field: 'baseline_kbtu', + displayName: 'kBTU', + cellFilter: 'number', + enableFiltering: false, + enableSorting: false, + headerCellClass: 'derived-column-display-name portfolio-summary-baseline-header' + }, + build_label_col_def('baseline-labels', 'baseline') + ]; + const current_cols = [ + { field: 'current_cycle', displayName: 'Cycle' }, + { field: 'current_sqft', displayName: `Area (${area_units})`, cellFilter: 'number' }, + { field: 'current_eui', displayName: `EUI (${eui_units})`, cellFilter: 'number' }, + { + field: 'current_kbtu', + displayName: 'kBTU', + cellFilter: 'number', + enableFiltering: false, + enableSorting: false, + headerCellClass: 'derived-column-display-name portfolio-summary-current-header' + }, + build_label_col_def('current-labels', 'current') + ]; + const summary_cols = [ + { + field: 'sqft_change', displayName: 'Sq Ft % Change', enableFiltering: false, enableSorting: false, headerCellClass: 'derived-column-display-name' + }, + { + field: 'eui_change', displayName: 'EUI % Improvement', enableFiltering: false, enableSorting: false, headerCellClass: 'derived-column-display-name' + } + ]; + + const goal_note_cols = [ + { + field: 'goal_note.question', + displayName: 'Question', + enableFiltering: false, + enableSorting: false, + editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray: $scope.question_options, + editDropdownIdLabel: 'value', + enableCellEdit: $scope.write_permission, + cellClass: () => $scope.write_permission && 'cell-edit', + // if user has write permission show a dropdown indicator + width: 350, + cellTemplate: ` +
+ + {{row.entity.goal_note.question}} + + +
+ ` + }, + { + field: 'goal_note.resolution', + displayName: 'Resolution', + enableFiltering: false, + enableSorting: false, + enableCellEdit: !viewer, + cellClass: !viewer && 'cell-edit', + width: 300 + }, + { + field: 'historical_note.text', + displayName: 'Historical Notes', + enableFiltering: false, + enableSorting: false, + enableCellEdit: !viewer, + cellClass: !viewer && 'cell-edit', + width: 300 + }, + { + field: 'goal_note.passed_checks', + displayName: 'Passed Checks', + enableFiltering: false, + enableSorting: false, + editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray: [{ id: 1, value: true }, { id: 2, value: false }], + editDropdownIdLabel: 'value', + enableCellEdit: $scope.write_permission, + cellClass: () => $scope.write_permission && 'cell-edit', + // if user has write permission show a dropdown indicator + cellTemplate: ` +
+ {{row.entity.goal_note.passed_checks}} + + +
+ ` + }, + { + field: 'goal_note.new_or_acquired', + displayName: 'New Build or Acquired', + enableFiltering: false, + enableSorting: false, + editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray: [{ id: 1, value: true }, { id: 2, value: false }], + editDropdownIdLabel: 'value', + enableCellEdit: $scope.write_permission, + cellClass: () => $scope.write_permission && 'cell-edit', + // if user has write permission show a dropdown indicator + cellTemplate: ` +
+ {{row.entity.goal_note.new_or_acquired}} + + +
+ ` + } + + ]; + + apply_defaults(baseline_cols, default_baseline); + apply_defaults(current_cols, default_current); + cols = [...cols, ...baseline_cols, ...current_cols, ...summary_cols, ...goal_note_cols]; + + // Apply filters + // from inventory_list_controller + _.map(cols, (col) => { + const options = {}; + if (col.pinnedLeft) { + col.pinnedLeft = false; + } + // not an ideal solution. How is this done on the inventory list + if (col.column_name === 'pm_property_id') { + col.type = 'number'; + } + if (col.data_type === 'datetime') { + options.cellFilter = 'date:\'yyyy-MM-dd h:mm a\''; + options.filter = inventory_service.dateFilter(); + } else if (['area', 'eui', 'float', 'number'].includes(col.data_type)) { + options.cellFilter = `number: ${$scope.organization.display_decimal_places}`; + options.filter = inventory_service.combinedFilter(); + } else { + options.filter = inventory_service.combinedFilter(); + } + return _.defaults(col, options, default_styles); + }); + + apply_cycle_sorts_and_filters(cols); + add_access_level_names(cols); + return cols; + }; + + const apply_cycle_sorts_and_filters = (columns) => { + // Cycle specific columns filters and sorts must be set manually + const cycle_columns = ['baseline_cycle', 'baseline_sqft', 'baseline_eui', 'baseline_kbtu', 'current_cycle', 'current_sqft', 'current_eui', 'current_kbtu', 'sqft_change', 'eui_change']; + + for (const column of columns) { + if (cycle_columns.includes(column.field)) { + const cycle_column = $scope.cycle_columns.find((col) => col.name === column.field); + column.sort = cycle_column ? cycle_column.sort : {}; + column.filter.term = cycle_column ? cycle_column.filters[0].term : null; + } + } + }; + + const add_access_level_names = (cols) => { + $scope.organization.access_level_names.slice(1).reverse().forEach((level) => { + cols.unshift({ + name: level, + displayName: level, + group: 'access_level_instance', + enableColumnMenu: true, + enableColumnMoving: false, + enableColumnResizing: true, + enableFiltering: true, + enableHiding: true, + enableSorting: true, + enablePinning: false, + exporterSuppressExport: true, + pinnedLeft: true, + visible: true, + width: 100, + cellClass: 'ali-cell', + headerCellClass: 'ali-header' + }); + }); + }; + + $scope.updateHeight = () => { + let height = 0; + for (const selector of ['.header', '.page_header_container', '.section_nav_container', '.goals-header-text', '.goal-actions-wrapper', '.goal-details-container', '#portfolio-summary-selection-wrapper', '.portfolio-summary-item-count']) { + const [element] = angular.element(selector); + height += element?.offsetHeight ?? 0; + } + angular.element('#portfolioSummary-gridOptions-wrapper').css('height', `calc(100vh - ${height}px)`); + $scope.summaryGridApi.core.handleWindowResize(); + $scope.gridApi.core.handleWindowResize(); + $scope.gridApi.grid.refresh(); + }; + + $scope.toggle_access_level_instances = () => { + $scope.show_access_level_instances = !$scope.show_access_level_instances; + $scope.gridOptions.columnDefs.forEach((col) => { + if (col.group === 'access_level_instance') { + col.visible = $scope.show_access_level_instances; + } + }); + $scope.gridApi.core.refresh(); + }; + + const format_cycle_columns = (columns) => { + /* filtering is based on existing db columns. + ** The PortfolioSummary uses cycle specific columns that do not exist elsewhere ('baseline_eui', 'current_sqft') + ** To sort on these columns, override the column name to the canonical column, and set the cycle filter order + ** ex: if sort = {name: 'baseline_sqft'}, set {name: 'gross_floor_area_##'} and filter for baseline properties first. + + ** NOTE: + ** cant filter on cycle - cycle is not a column + ** cant filter on kbtu, sqft_change, eui_change - not real columns. calc'ed from eui and sqft. (similar to derived columns) + */ + const eui_column = $scope.columns.find((col) => col.id === $scope.goal.eui_column1); + const area_column = $scope.columns.find((col) => col.id === $scope.goal.area_column); + + const cycle_column_lookup = { + baseline_eui: eui_column.name, + baseline_sqft: area_column.name, + current_eui: eui_column.name, + current_sqft: area_column.name + }; + $scope.cycle_columns = []; + + for (const column of columns) { + if (cycle_column_lookup[column.name]) { + $scope.cycle_columns.push({ ...column }); + column.name = cycle_column_lookup[column.name]; + } + } + + return columns; + }; + + const remove_conflict_columns = (grid_columns) => { + // Properties are returned from 2 different get requests. One for the current, one for the baseline + // The second filter is solely based on the property ids from the first + // Filtering on the first and second will result in unrepresentative data + // Remove the conflict to allow sorting/filtering on either baseline or current. + + const column_names = grid_columns.map((c) => c.name); + const includes_baseline = column_names.some((name) => name.includes('baseline')); + const includes_current = column_names.some((name) => name.includes('current')); + const conflict = includes_baseline && includes_current; + + if (conflict) { + baseline_first = !baseline_first; + const excluded_name = baseline_first ? 'current' : 'baseline'; + grid_columns = grid_columns.filter((column) => !column.name.includes(excluded_name)); + } else if (includes_baseline) { + baseline_first = true; + } else if (includes_current) { + baseline_first = false; + } + + return grid_columns; + }; + + // from inventory_list_controller + const updateColumnFilterSort = () => { + let grid_columns = _.filter($scope.gridApi.saveState.save().columns, (col) => _.keys(col.sort).filter((key) => key !== 'ignoreSort').length + (_.get(col, 'filters[0].term', '') || '').length > 0); + // check filter/sort columns. Cannot filter on both baseline and current. choose the more recent filter/sort + grid_columns = remove_conflict_columns(grid_columns); + // convert cycle columns to canonical columns + const formatted_columns = format_cycle_columns(grid_columns); + + // inventory_service.saveGridSettings(`${localStorageKey}.sort`, { + // columns + // }); + $scope.column_filters = []; + // parse the filters and sorts + for (const column of formatted_columns) { + // format column if cycle specific + const { name, filters, sort } = column; + // remove the column id at the end of the name + const column_name = name.split('_').slice(0, -1).join('_'); + + for (const filter of filters) { + if (_.isEmpty(filter)) { + // eslint-disable-next-line no-continue + continue; + } + + // a filter can contain many comma-separated filters + const subFilters = _.map(_.split(filter.term, ','), _.trim); + for (const subFilter of subFilters) { + if (subFilter) { + const { string, operator, value } = parseFilter(subFilter); + const display = [$scope.columnDisplayByName[name], string, value].join(' '); + $scope.column_filters.push({ + name, + column_name, + operator, + value, + display + }); + } + } + } + + if (sort.direction) { + // remove the column id at the end of the name + const column_name = name.split('_').slice(0, -1).join('_'); + const display = [$scope.columnDisplayByName[name], sort.direction].join(' '); + $scope.column_sorts = [{ + name, + column_name, + direction: sort.direction, + display, + priority: sort.priority + }]; + // $scope.column_sorts.sort((a, b) => a.priority > b.priority); + } + } + // $scope.isModified(); + }; + + // from inventory_list_controller + // https://regexr.com/6cka2 + const combinedRegex = /^(!?)=\s*(-?\d+(?:\.\d+)?)$|^(!?)=?\s*"((?:[^"]|\\")*)"$|^(<=?|>=?)\s*((-?\d+(?:\.\d+)?)|(\d{4}-\d{2}-\d{2}))$/; + const parseFilter = (expression) => { + // parses an expression string into an object containing operator and value + const filterData = expression.match(combinedRegex); + if (filterData) { + if (!_.isUndefined(filterData[2])) { + // Numeric Equality + const operator = filterData[1]; + const value = Number(filterData[2].replace('\\.', '.')); + if (operator === '!') { + return { string: 'is not', operator: 'ne', value }; + } + return { string: 'is', operator: 'exact', value }; + } + if (!_.isUndefined(filterData[4])) { + // Text Equality + const operator = filterData[3]; + const value = filterData[4]; + if (operator === '!') { + return { string: 'is not', operator: 'ne', value }; + } + return { string: 'is', operator: 'exact', value }; + } + if (!_.isUndefined(filterData[7])) { + // Numeric Comparison + const operator = filterData[5]; + const value = Number(filterData[6].replace('\\.', '.')); + switch (operator) { + case '<': + return { string: '<', operator: 'lt', value }; + case '<=': + return { string: '<=', operator: 'lte', value }; + case '>': + return { string: '>', operator: 'gt', value }; + case '>=': + return { string: '>=', operator: 'gte', value }; + } + } else { + // Date Comparison + const operator = filterData[5]; + const value = filterData[8]; + switch (operator) { + case '<': + return { string: '<', operator: 'lt', value }; + case '<=': + return { string: '<=', operator: 'lte', value }; + case '>': + return { string: '>', operator: 'gt', value }; + case '>=': + return { string: '>=', operator: 'gte', value }; + } + } + } else { + // Case-insensitive Contains + return { string: 'contains', operator: 'icontains', value: expression }; + } + }; + + const set_grid_options = (result) => { + $scope.data = format_properties(result); + spinner_utility.hide(); + $scope.gridOptions = { + data: 'data', + columnDefs: selected_columns(), + enableFiltering: true, + enableHorizontalScrollbar: uiGridConstants.scrollbars.WHEN_NEEDED, + cellWidth: 200, + enableGridMenu: true, + exporterMenuCsv: false, + exporterMenuExcel: false, + exporterMenuPdf: false, + gridMenuShowHideColumns: false, + gridMenuCustomItems: [{ + title: 'Export Page to CSV', + action: () => $scope.gridApi.exporter.csvExport('all', 'all') + }], + onRegisterApi: (gridApi) => { + $scope.gridApi = gridApi; + + _.delay($scope.updateHeight, 150); + + const debouncedHeightUpdate = _.debounce($scope.updateHeight, 150); + angular.element($window).on('resize', debouncedHeightUpdate); + $scope.$on('$destroy', () => { + angular.element($window).off('resize', debouncedHeightUpdate); + }); + + gridApi.core.on.sortChanged($scope, () => { + spinner_utility.show(); + _.debounce(() => { + updateColumnFilterSort(); + $scope.load_inventory(1); + }, 500)(); + }); + + gridApi.core.on.filterChanged($scope, _.debounce(() => { + spinner_utility.show(); + updateColumnFilterSort(); + $scope.load_inventory(1); + }, 2000)); + + gridApi.edit.on.afterCellEdit($scope, (rowEntity, colDef, newValue) => { + const [model, field] = colDef.field.split('.'); + + if (model === 'historical_note') { + goal_service.update_historical_note(rowEntity.id, rowEntity.historical_note.id, { [field]: newValue }); + } else if (model === 'goal_note') { + goal_service.update_goal_note(rowEntity.id, rowEntity.goal_note.id, { [field]: newValue }); + } + }); + } + }; + }; + + $scope.reset_sorts_filters = () => { + $scope.reset_sorts(); + $scope.reset_filters(); + }; + $scope.reset_sorts = () => { + $scope.column_sorts = []; + $scope.gridApi.core.refresh(); + }; + $scope.reset_filters = () => { + $scope.column_filters = []; + $scope.gridApi.grid.clearAllFilters(); + }; + + // -------- SUMMARY LOGIC ------------ + + const summary_selected_columns = () => { + const default_baseline = { headerCellClass: 'portfolio-summary-baseline-header', cellClass: 'portfolio-summary-baseline-cell' }; + const default_current = { headerCellClass: 'portfolio-summary-current-header', cellClass: 'portfolio-summary-current-cell' }; + const default_styles = { headerCellFilter: 'translate' }; + + const baseline_cols = [ + { field: 'baseline_cycle', displayName: 'Cycle' }, + { field: 'baseline_total_sqft', displayName: `Total Area (${area_units})`, cellFilter: 'number' }, + { field: 'baseline_total_kbtu', displayName: 'Total kBTU', cellFilter: 'number' }, + { field: 'baseline_weighted_eui', displayName: `EUI (${eui_units})`, cellFilter: 'number' } + ]; + const current_cols = [ + { field: 'current_cycle', displayName: 'Cycle' }, + { field: 'current_total_sqft', displayName: `Total Area (${area_units})`, cellFilter: 'number' }, + { field: 'current_total_kbtu', displayName: 'Total kBTU', cellFilter: 'number' }, + { field: 'current_weighted_eui', displayName: `EUI (${eui_units})`, cellFilter: 'number' } + ]; + const calc_cols = [ + { field: 'sqft_change', displayName: 'Area % Change' }, + { + field: 'eui_change', + displayName: 'EUI % Improvement', + cellClass: (grid, row) => (row.entity.eui_change >= $scope.goal.target_percentage ? 'above-target' : 'below-target') + } + ]; + apply_defaults(baseline_cols, default_baseline, default_styles); + apply_defaults(current_cols, default_current, default_styles); + apply_defaults(calc_cols); + + return [...baseline_cols, ...current_cols, ...calc_cols].map((col) => ({ + ...col, + minWidth: 50 + })); + }; + + const format_summary = (summary) => { + const baseline = summary.baseline; + const current = summary.current; + return [{ + baseline_cycle: baseline.cycle_name, + baseline_total_sqft: baseline.total_sqft, + baseline_total_kbtu: baseline.total_kbtu, + baseline_weighted_eui: baseline.weighted_eui, + current_cycle: current.cycle_name, + current_total_sqft: current.total_sqft, + current_total_kbtu: current.total_kbtu, + current_weighted_eui: current.weighted_eui, + sqft_change: summary.sqft_change, + eui_change: summary.eui_change + }]; + }; + + const set_summary_grid_options = (summary) => { + $scope.summary_data = format_summary(summary); + $scope.summaryGridOptions = { + data: 'summary_data', + columnDefs: summary_selected_columns(), + enableHorizontalScrollbar: uiGridConstants.scrollbars.WHEN_NEEDED, + enableVerticalScrollbar: uiGridConstants.scrollbars.NEVER, + enableSorting: false, + minRowsToShow: 1, + onRegisterApi: (gridApi) => { + $scope.summaryGridApi = gridApi; + } + }; + }; + }]); diff --git a/seed/static/seed/js/controllers/program_setup_controller.js b/seed/static/seed/js/controllers/program_setup_controller.js index bfa9349cab..8f021c4015 100644 --- a/seed/static/seed/js/controllers/program_setup_controller.js +++ b/seed/static/seed/js/controllers/program_setup_controller.js @@ -220,7 +220,7 @@ angular.module('BE.seed.controller.program_setup', []).controller('program_setup $scope.compliance_metrics_error.push(`${key}: ${error}`); } } else { - // success. the ID would already be saved so this block seems unnecesary + // success. the ID would already be saved so this block seems unnecessary if (!$scope.selected_compliance_metric.id) { $scope.selected_compliance_metric.id = data.id; } diff --git a/seed/static/seed/js/controllers/update_item_labels_modal_controller.js b/seed/static/seed/js/controllers/update_item_labels_modal_controller.js index f4ae8b9475..f000a30fbe 100644 --- a/seed/static/seed/js/controllers/update_item_labels_modal_controller.js +++ b/seed/static/seed/js/controllers/update_item_labels_modal_controller.js @@ -15,14 +15,16 @@ angular.module('BE.seed.controller.update_item_labels_modal', []).controller('up 'label_service', 'inventory_ids', 'inventory_type', + 'is_ali_root', 'Notification', 'spinner_utility', // eslint-disable-next-line func-names - function ($scope, $log, $uibModalInstance, label_service, inventory_ids, inventory_type, notification, spinner_utility) { + function ($scope, $log, $uibModalInstance, label_service, inventory_ids, inventory_type, is_ali_root, Notification, spinner_utility) { $scope.inventory_ids = inventory_ids; $scope.inventory_type = inventory_type; // keep track of status of service call $scope.loading = false; + $scope.is_ali_root = is_ali_root; // An array of all available labels in the system. // These label objects should have the is_applied property set so @@ -59,7 +61,7 @@ angular.module('BE.seed.controller.update_item_labels_modal', []).controller('up // in this modal... createdLabel.is_checked_add = true; - $scope.newLabelForm.$setPristine(); + form.$setPristine(); $scope.labels.unshift(createdLabel); $scope.initialize_new_label(); }, @@ -104,9 +106,9 @@ angular.module('BE.seed.controller.update_item_labels_modal', []).controller('up label_service.update_property_labels(addLabelIDs, removeLabelIDs, inventory_ids).then( (data) => { if (data.num_updated === 1) { - notification.primary(`${data.num_updated} property updated.`); + Notification.primary(`${data.num_updated} property updated.`); } else { - notification.primary(`${data.num_updated} properties updated.`); + Notification.primary(`${data.num_updated} properties updated.`); } $uibModalInstance.close(); }, @@ -119,9 +121,9 @@ angular.module('BE.seed.controller.update_item_labels_modal', []).controller('up label_service.update_taxlot_labels(addLabelIDs, removeLabelIDs, inventory_ids).then( (data) => { if (data.num_updated === 1) { - notification.primary(`${data.num_updated} tax lot updated.`); + Notification.primary(`${data.num_updated} tax lot updated.`); } else { - notification.primary(`${data.num_updated} tax lots updated.`); + Notification.primary(`${data.num_updated} tax lots updated.`); } $uibModalInstance.close(); }, diff --git a/seed/static/seed/js/directives/sdUploader.js b/seed/static/seed/js/directives/sdUploader.js index 9592171a51..801d8b114e 100644 --- a/seed/static/seed/js/directives/sdUploader.js +++ b/seed/static/seed/js/directives/sdUploader.js @@ -160,6 +160,145 @@ const makeFileSystemUploader = (scope, element, allowed_extensions) => { return uploader; }; +const makeAccessLevelInstanceUploader = (scope, element, allowed_extensions) => { + const uploader = new qq.FineUploaderBasic({ + button: element[0], + request: { + method: 'PUT', + endpoint: `/api/v3/organizations/${scope.organizationId}/access_levels/importer/`, + inputName: 'file', + paramsInBody: true, + forceMultipart: true, + customHeaders: { + 'X-CSRFToken': BE.csrftoken + } + }, + validation: { + allowedExtensions: allowed_extensions + }, + text: { + fileInputTitle: '', + uploadButton: scope.buttontext + }, + retry: { + enableAuto: false + }, + iframeSupport: { + localBlankPathPage: '/success.html' + }, + /** + * multiple: only allow one file to be uploaded at a time + */ + multiple: false, + maxConnections: 20, + callbacks: { + /** + * onSubmitted: overloaded callback that calls the callback defined + * in the element attribute. Passes as arguments to the callback + * a message indicating upload has started, "upload_submitted", and + * the filename. + */ + onSubmitted: (id, fileName) => { + scope.eventfunc({ + message: 'upload_submitted', + file: { + filename: fileName, + source_type: scope.sourcetype + } + }); + const params = { + csrf_token: BE.csrftoken, + csrf_name: 'csrfmiddlewaretoken', + csrf_xname: 'X-CSRFToken', + organization_id: scope.organizationId + }; + + uploader.setParams(params); + }, + /** + * onComplete: overloaded callback that calls the callback defined + * in the element attribute unless the upload failed, which will + * fire a window alert. Passes as arguments to the callback + * a message indicating upload has completed, "ali_upload_complete", and + * the filename. + */ + onComplete: (id, fileName, responseJSON) => { + if (!responseJSON.success) { + alert('Upload failed.'); + } else { + scope.eventfunc({ + message: 'ali_upload_complete', + file: { + filename: fileName, + stored_filename: responseJSON.tempfile, + source_type: scope.sourcetype, + organization_id: scope.organizationId + } + }); + } + }, + /** + * onProgress: overloaded callback that calls the callback defined + * in the element attribute. Passes as arguments to the callback + * a message indicating upload is in progress, "upload_in_progress", + * the filename, and a progress object with two keys: loaded - the + * bytes of the file loaded, and total - the total number of bytes + * for the file. + */ + onProgress: (id, fileName, loaded, total) => { + scope.eventfunc({ + message: 'upload_in_progress', + file: { + filename: fileName, + source_type: scope.sourcetype + }, + progress: { + loaded, + total + } + }); + }, + /** + * onError: overloaded callback that calls the callback defined + * in the element attribute. Primarily for non-conforming files + * that return 400 from the backend and invalid file extensions. + */ + onError: (id, fileName, errorReason, xhr) => { + if (errorReason.includes(' has an invalid extension.')) { + scope.eventfunc({ message: 'invalid_xml_extension' }); + return; + } + + // Ignore this error handler if the network request hasn't taken place yet (e.g., invalid file extension) + if (!xhr) { + alert(errorReason); + return; + } + + let error = errorReason; + try { + const json = JSON.parse(xhr.responseText); + if (_.has(json, 'message')) { + error = json.message; + } + } catch (e) { + // no-op + } + + scope.eventfunc({ + message: 'upload_error', + file: { + filename: fileName, + source_type: scope.sourcetype, + error + } + }); + } + } + }); + return uploader; +}; + const makeBuildingSyncUpdater = (scope, element, allowed_extensions) => { const uploader = new qq.FineUploaderBasic({ button: element[0], @@ -587,7 +726,9 @@ const makeDocumentUploader = (scope, element, allowed_extensions) => { const sdUploaderFineUploader = (scope, element /* , attrs, filename */) => { let uploader; - if (scope.sourcetype === 'BuildingSyncUpdate') { + if (scope.sourcetype === 'AccessLevelInstances') { + uploader = makeAccessLevelInstanceUploader(scope, element, ['csv', 'xls', 'xlsx']); + } else if (scope.sourcetype === 'BuildingSyncUpdate') { uploader = makeBuildingSyncUpdater(scope, element, ['xml']); } else if (scope.sourcetype === 'ESPMUpdate') { uploader = makeESPMUpdater(scope, element, ['xlsx']); diff --git a/seed/static/seed/js/seed.js b/seed/static/seed/js/seed.js index 34ba3e5dce..773e756a86 100644 --- a/seed/static/seed/js/seed.js +++ b/seed/static/seed/js/seed.js @@ -12,6 +12,7 @@ angular.module('BE.seed.vendor_dependencies', [ 'ui.grid', 'ui.grid.draggable-rows', 'ui.grid.exporter', + 'ui.grid.edit', 'ui.grid.moveColumns', 'ui.grid.pinning', 'ui.grid.resizeColumns', @@ -74,6 +75,7 @@ angular.module('BE.seed.controllers', [ 'BE.seed.controller.export_to_audit_template_modal', 'BE.seed.controller.filter_group_modal', 'BE.seed.controller.geocode_modal', + 'BE.seed.controller.goal_editor_modal', 'BE.seed.controller.green_button_upload_modal', 'BE.seed.controller.insights_program', 'BE.seed.controller.insights_property', @@ -106,21 +108,27 @@ angular.module('BE.seed.controllers', [ 'BE.seed.controller.new_member_modal', 'BE.seed.controller.notes', 'BE.seed.controller.organization', + 'BE.seed.controller.organization_access_level_tree', + 'BE.seed.controller.organization_add_access_level_instance_modal', + 'BE.seed.controller.organization_add_access_level_modal', + 'BE.seed.controller.organization_delete_access_level_instance_modal', + 'BE.seed.controller.organization_edit_access_level_instance_modal', 'BE.seed.controller.organization_settings', 'BE.seed.controller.organization_sharing', 'BE.seed.controller.pairing', 'BE.seed.controller.pairing_settings', + 'BE.seed.controller.portfolio_summary', 'BE.seed.controller.postoffice_modal', 'BE.seed.controller.profile', 'BE.seed.controller.program_setup', 'BE.seed.controller.record_match_merge_link_modal', - 'BE.seed.controller.set_update_to_now_modal', 'BE.seed.controller.rename_column_modal', 'BE.seed.controller.reset_modal', 'BE.seed.controller.sample_data_modal', 'BE.seed.controller.security', 'BE.seed.controller.sensor_readings_upload_modal', 'BE.seed.controller.sensors_upload_modal', + 'BE.seed.controller.set_update_to_now_modal', 'BE.seed.controller.settings_profile_modal', 'BE.seed.controller.show_populated_columns_modal', 'BE.seed.controller.ubid_admin', @@ -145,6 +153,7 @@ angular.module('BE.seed.directives', [ 'sdUploader' ]); angular.module('BE.seed.services', [ + 'BE.seed.service.ah', 'BE.seed.service.analyses', 'BE.seed.service.audit_template', 'BE.seed.service.auth', @@ -161,6 +170,7 @@ angular.module('BE.seed.services', [ 'BE.seed.service.filter_groups', 'BE.seed.service.flippers', 'BE.seed.service.geocode', + 'BE.seed.service.goal', 'BE.seed.service.httpParamSerializerSeed', 'BE.seed.service.inventory', 'BE.seed.service.inventory_reports', @@ -775,6 +785,14 @@ SEED_app.config([ return note_service.get_notes(organization_id, $stateParams.inventory_type, $stateParams.view_id); } ], + auth_payload: [ + 'auth_service', + 'user_service', + (auth_service, user_service) => { + const organization_id = user_service.get_organization().id; + return auth_service.is_authorized(organization_id, ['requires_member']); + } + ], $uibModalInstance: () => undefined } }) @@ -1235,6 +1253,194 @@ SEED_app.config([ ] } }) + .state({ + name: 'programs', + url: '/accounts/{organization_id:int}/program_setup', + templateUrl: `${static_url}seed/partials/program_setup.html`, + controller: 'program_setup_controller', + resolve: { + valid_column_data_types: [ + () => ['number', 'float', 'integer', 'ghg', 'ghg_intensity', 'area', 'eui', 'boolean'] + ], + valid_x_axis_data_types: [ + () => ['number', 'string', 'float', 'integer', 'ghg', 'ghg_intensity', 'area', 'eui', 'boolean'] + ], + compliance_metrics: [ + '$stateParams', + 'compliance_metric_service', + ($stateParams, compliance_metric_service) => compliance_metric_service.get_compliance_metrics($stateParams.organization_id) + ], + organization_payload: [ + 'organization_service', + '$stateParams', + (organization_service, $stateParams) => organization_service.get_organization($stateParams.organization_id) + ], + cycles_payload: [ + 'cycle_service', + '$stateParams', + (cycle_service, $stateParams) => cycle_service.get_cycles_for_org($stateParams.organization_id) + ], + property_columns: [ + 'valid_column_data_types', + '$stateParams', + 'inventory_service', + 'naturalSort', + (valid_column_data_types, $stateParams, inventory_service, naturalSort) => inventory_service.get_property_columns_for_org($stateParams.organization_id).then((columns) => { + columns = _.reject(columns, (item) => item.related || !valid_column_data_types.includes(item.data_type)).sort((a, b) => naturalSort(a.displayName, b.displayName)); + return columns; + }) + ], + x_axis_columns: [ + 'valid_x_axis_data_types', + '$stateParams', + 'inventory_service', + 'naturalSort', + (valid_x_axis_data_types, $stateParams, inventory_service, naturalSort) => inventory_service.get_property_columns_for_org($stateParams.organization_id).then((columns) => { + columns = _.reject(columns, (item) => item.related || !valid_x_axis_data_types.includes(item.data_type)).sort((a, b) => naturalSort(a.displayName, b.displayName)); + return columns; + }) + ], + filter_groups: [ + '$stateParams', + 'filter_groups_service', + ($stateParams, filter_groups_service) => { + const inventory_type = 'Property'; // just properties for now + return filter_groups_service.get_filter_groups(inventory_type, $stateParams.organization_id); + } + ], + auth_payload: [ + 'auth_service', + '$stateParams', + '$q', + (auth_service, $stateParams, $q) => auth_service.is_authorized($stateParams.organization_id, ['requires_member']).then( + (data) => { + if (data.auth.requires_member) { + return data; + } + return $q.reject('not authorized'); + }, + (data) => $q.reject(data.message) + ) + ] + } + }) + .state({ + name: 'program_setup', + url: '/accounts/{organization_id:int}/program_setup/{id:int}', + templateUrl: `${static_url}seed/partials/program_setup.html`, + controller: 'program_setup_controller', + resolve: { + valid_column_data_types: [ + () => ['number', 'float', 'integer', 'ghg', 'ghg_intensity', 'area', 'eui', 'boolean'] + ], + valid_x_axis_data_types: [ + () => ['number', 'string', 'float', 'integer', 'ghg', 'ghg_intensity', 'area', 'eui', 'boolean'] + ], + compliance_metrics: [ + '$stateParams', + 'compliance_metric_service', + ($stateParams, compliance_metric_service) => compliance_metric_service.get_compliance_metrics($stateParams.organization_id) + ], + organization_payload: [ + 'organization_service', + '$stateParams', + (organization_service, $stateParams) => organization_service.get_organization($stateParams.organization_id) + ], + cycles_payload: [ + 'cycle_service', + '$stateParams', + (cycle_service, $stateParams) => cycle_service.get_cycles_for_org($stateParams.organization_id) + ], + property_columns: [ + 'valid_column_data_types', + '$stateParams', + 'inventory_service', + 'naturalSort', + (valid_column_data_types, $stateParams, inventory_service, naturalSort) => inventory_service.get_property_columns_for_org($stateParams.organization_id).then((columns) => { + columns = _.reject(columns, (item) => item.related || !valid_column_data_types.includes(item.data_type)).sort((a, b) => naturalSort(a.displayName, b.displayName)); + return columns; + }) + ], + x_axis_columns: [ + 'valid_x_axis_data_types', + '$stateParams', + 'inventory_service', + 'naturalSort', + (valid_x_axis_data_types, $stateParams, inventory_service, naturalSort) => inventory_service.get_property_columns_for_org($stateParams.organization_id).then((columns) => { + columns = _.reject(columns, (item) => item.related || !valid_x_axis_data_types.includes(item.data_type)).sort((a, b) => naturalSort(a.displayName, b.displayName)); + return columns; + }) + ], + filter_groups: [ + '$stateParams', + 'filter_groups_service', + ($stateParams, filter_groups_service) => { + const inventory_type = 'Property'; // just properties for now + return filter_groups_service.get_filter_groups(inventory_type, $stateParams.organization_id); + } + ], + auth_payload: [ + 'auth_service', + '$stateParams', + '$q', + (auth_service, $stateParams, $q) => auth_service.is_authorized($stateParams.organization_id, ['requires_member']).then( + (data) => { + if (data.auth.requires_member) { + return data; + } + return $q.reject('not authorized'); + }, + (data) => $q.reject(data.message) + ) + ] + } + }) + .state({ + name: 'organization_access_level_tree', + url: '/accounts/{organization_id:int}/access_level_tree', + templateUrl: `${static_url}seed/partials/organization_access_level_tree.html`, + controller: 'organization_access_level_tree_controller', + resolve: { + organization_payload: [ + 'organization_service', + '$stateParams', + '$q', + (organization_service, $stateParams, $q) => { + const organization_id = $stateParams.organization_id; + return organization_service.get_organization(organization_id) + .then((data) => { + if (data.organization.is_parent) { + return data; + } + return $q.reject('Your page could not be located!'); + }); + } + ], + auth_payload: [ + 'auth_service', + '$stateParams', + '$q', + (auth_service, $stateParams, $q) => { + const organization_id = $stateParams.organization_id; + return auth_service.is_authorized(organization_id, ['requires_viewer', 'requires_owner']) + .then((data) => { + if (data.auth.requires_viewer) { + return data; + } + return $q.reject('not authorized'); + }, (data) => $q.reject(data.message)); + } + ], + access_level_tree: [ + 'organization_service', + '$stateParams', + (organization_service, $stateParams) => { + const organization_id = $stateParams.organization_id; + return organization_service.get_organization_access_level_tree(organization_id); + } + ] + } + }) .state({ name: 'organization_column_settings', url: '/accounts/{organization_id:int}/column_settings/{inventory_type:properties|taxlots}', @@ -1602,6 +1808,14 @@ SEED_app.config([ user_profile_payload: [ 'user_service', (user_service) => user_service.get_user_profile() + ], + access_level_tree: [ + 'organization_service', + '$stateParams', + (organization_service, $stateParams) => { + const organization_id = $stateParams.organization_id; + return organization_service.get_organization_access_level_tree(organization_id); + } ] } }) @@ -2151,11 +2365,11 @@ SEED_app.config([ return inventory_service.get_column_list_profiles('Detail View Profile', inventory_type); } ], - users_payload: [ - 'organization_service', - 'user_service', - (organization_service, user_service) => organization_service.get_organization_users({ org_id: user_service.get_organization().id }) - ], + // users_payload: [ + // 'organization_service', + // 'user_service', + // (organization_service, user_service) => organization_service.get_organization_users({ org_id: user_service.get_organization().id }) + // ], current_profile: [ '$stateParams', 'inventory_service', @@ -2298,11 +2512,11 @@ SEED_app.config([ 'organization_service', (user_service, organization_service) => organization_service.get_organization(user_service.get_organization().id) ], - users_payload: [ - 'user_service', - 'organization_service', - (user_service, organization_service) => organization_service.get_organization_users({ org_id: user_service.get_organization().id }) - ], + // users_payload: [ + // 'user_service', + // 'organization_service', + // (user_service, organization_service) => organization_service.get_organization_users({ org_id: user_service.get_organization().id }) + // ], views_payload: [ '$stateParams', 'user_service', @@ -2626,6 +2840,29 @@ SEED_app.config([ ] } }) + .state({ + name: 'portfolio_summary', + url: '/insights/portfolio_summary', + templateUrl: `${static_url}seed/partials/portfolio_summary.html`, + controller: 'portfolio_summary_controller', + resolve: { + valid_column_data_types: [() => ['number', 'float', 'integer', 'area', 'eui', 'ghg', 'ghg_intensity']], + property_columns: ['valid_column_data_types', '$stateParams', 'inventory_service', (valid_column_data_types, $stateParams, inventory_service) => inventory_service.get_property_columns_for_org($stateParams.organization_id).then((columns) => { + _.remove(columns, { table_name: 'TaxLotState' }); + return columns; + })], + cycles: ['cycle_service', (cycle_service) => cycle_service.get_cycles()], + organization_payload: ['user_service', 'organization_service', (user_service, organization_service) => organization_service.get_organization(user_service.get_organization().id)], + access_level_tree: ['organization_payload', 'organization_service', (organization_payload, organization_service) => { + const organization_id = organization_payload.organization.id; + return organization_service.get_organization_access_level_tree(organization_id); + }], + auth_payload: ['auth_service', 'organization_payload', (auth_service, organization_payload) => { + const organization_id = organization_payload.organization.id; + return auth_service.is_authorized(organization_id, ['requires_owner']); + }] + } + }) .state({ name: 'data_view', url: '/insights/custom/{id:int}', diff --git a/seed/static/seed/js/services/ah_service.js b/seed/static/seed/js/services/ah_service.js new file mode 100644 index 0000000000..c65558398f --- /dev/null +++ b/seed/static/seed/js/services/ah_service.js @@ -0,0 +1,34 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.service.ah', []).factory('ah_service', [ + () => { + const { compare } = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }); + + const recurse_access_levels = (tree, access_level_instances_by_depth, depth = 1) => { + if (!tree) return; + if (!access_level_instances_by_depth[depth]) access_level_instances_by_depth[depth] = []; + for (const ali of tree) { + access_level_instances_by_depth[depth].push({ id: ali.id, name: ali.data.name }); + recurse_access_levels(ali.children, access_level_instances_by_depth, depth + 1); + } + }; + + // Build out access_level_instances_by_depth recursively + const calculate_access_level_instances_by_depth = (tree) => { + const access_level_instances_by_depth = {}; + recurse_access_levels(tree, access_level_instances_by_depth); + + // Sort instances + for (const [depth, instances] of Object.entries(access_level_instances_by_depth)) { + access_level_instances_by_depth[depth] = instances.sort((a, b) => compare(a.name, b.name)); + } + return access_level_instances_by_depth; + }; + + return { + calculate_access_level_instances_by_depth + }; + } +]); diff --git a/seed/static/seed/js/services/analyses_service.js b/seed/static/seed/js/services/analyses_service.js index 458022bee1..8ccbadef95 100644 --- a/seed/static/seed/js/services/analyses_service.js +++ b/seed/static/seed/js/services/analyses_service.js @@ -26,7 +26,7 @@ angular.module('BE.seed.service.analyses', []).factory('analyses_service', [ const get_analysis_view_for_org = (analysis_id, view_id, org_id) => $http.get(`/api/v3/analyses/${analysis_id}/views/${view_id}/?organization_id=${org_id}`).then((response) => response.data); - const create_analysis = (name, service, configuration, property_view_ids) => { + const create_analysis = (name, service, configuration, property_view_ids, access_level_instance_id) => { const organization_id = user_service.get_organization().id; return $http({ url: '/api/v3/analyses/', @@ -36,7 +36,8 @@ angular.module('BE.seed.service.analyses', []).factory('analyses_service', [ name, service, configuration, - property_view_ids + property_view_ids, + access_level_instance_id, } }).then((response) => response.data); }; diff --git a/seed/static/seed/js/services/goal_service.js b/seed/static/seed/js/services/goal_service.js new file mode 100644 index 0000000000..03c52cfe53 --- /dev/null +++ b/seed/static/seed/js/services/goal_service.js @@ -0,0 +1,79 @@ +/** + * SEED Platform (TM), Copyright (c) Alliance for Sustainable Energy, LLC, and other contributors. + * See also https://github.com/seed-platform/seed/main/LICENSE.md + */ +angular.module('BE.seed.service.goal', []).factory('goal_service', [ + '$http', + 'user_service', + ( + $http, + user_service, + ) => { + const goal_service = {}; + + goal_service.create_goal = (goal) => { + return $http.post('/api/v3/goals/', goal) + .then(response => response) + .catch((response) => response); + } + + goal_service.update_goal = (goal) => { + return $http.put(`/api/v3/goals/${goal.id}/`, goal) + .then(response => response) + .catch(response => response) + } + + goal_service.update_goal_note = (property, goal_note, data) => { + return $http.put(`/api/v3/properties/${property}/goal_notes/${goal_note}/`, + data, + {params: { organization_id: user_service.get_organization().id }} + ) + .then(response => response) + .catch(response => response) + + } + + goal_service.get_goals = () => { + return $http.get('/api/v3/goals/', { + params: { + organization_id: user_service.get_organization().id + } + }) + .then(response => response.data) + .catch(response => response); + } + + goal_service.delete_goal = (goal_id) => { + return $http.delete(`/api/v3/goals/${goal_id}`, { + params: { + organization_id: user_service.get_organization().id + } + }) + .then(response => response) + .catch(response => response) + } + + goal_service.get_portfolio_summary = (goal_id) => { + return $http.get(`/api/v3/goals/${goal_id}/portfolio_summary/`, { + params: { + organization_id: user_service.get_organization().id + } + }) + .then(response => response) + .catch(response => response) + } + + goal_service.update_historical_note = (property, historical_note, data) => { + data.property = property + return $http.put(`/api/v3/properties/${property}/historical_notes/${historical_note}/`, + data, + {params: { organization_id: user_service.get_organization().id}} + ) + .then(response => response) + .catch(response => response) + } + + return goal_service + } + ] +) diff --git a/seed/static/seed/js/services/inventory_service.js b/seed/static/seed/js/services/inventory_service.js index ea2e63dddb..798ecd7e0a 100644 --- a/seed/static/seed/js/services/inventory_service.js +++ b/seed/static/seed/js/services/inventory_service.js @@ -62,7 +62,10 @@ angular.module('BE.seed.service.inventory', []).factory('inventory_service', [ column_filters = null, column_sorts = null, ids_only = null, - shown_column_ids = null + shown_column_ids = null, + access_level_instance_id = null, + include_property_ids, + goal_id = null, ) => { organization_id = organization_id == undefined ? user_service.get_organization().id : organization_id; @@ -97,16 +100,26 @@ angular.module('BE.seed.service.inventory', []).factory('inventory_service', [ params.cycle = lastCycleId; } + const data = { + // Pass the specific ids if they exist + include_view_ids, + exclude_view_ids, + include_property_ids, + // Pass the current profile (if one exists) to limit the column data that is returned + profile_id + }; + // add access_level_instance if it exists + if (access_level_instance_id) { + data.access_level_instance_id = access_level_instance_id; + } + if (goal_id) { + data.goal_id = goal_id + } + return $http .post( '/api/v3/properties/filter/', - { - // Pass the specific ids if they exist - include_view_ids, - exclude_view_ids, - // Pass the current profile (if one exists) to limit the column data that is returned - profile_id - }, + data, { params } @@ -1205,6 +1218,12 @@ angular.module('BE.seed.service.inventory', []).factory('inventory_service', [ } }); + inventory_service.filter_by_property = (cycle_id, property_ids) => $http.post('/api/v3/properties/filter_by_property/', { + organization_id: user_service.get_organization().id, + cycle: cycle_id, + property_ids + }).then((response) => response.data); + return inventory_service; } ]); diff --git a/seed/static/seed/js/services/organization_service.js b/seed/static/seed/js/services/organization_service.js index 394ac7cba4..93528c4d8a 100644 --- a/seed/static/seed/js/services/organization_service.js +++ b/seed/static/seed/js/services/organization_service.js @@ -51,12 +51,33 @@ angular.module('BE.seed.service.organization', []).factory('organization_service }) .then((response) => response.data); + organization_factory.get_organization_access_level_tree = (org_id) => $http.get(`/api/v3/organizations/${org_id}/access_levels/tree`).then((response) => response.data); + + organization_factory.update_organization_access_level_names = (org_id, new_access_level_names) => $http.post( + `/api/v3/organizations/${org_id}/access_levels/access_level_names/`, + { access_level_names: new_access_level_names } + ).then((response) => response.data); + + organization_factory.can_delete_access_level_instance = (org_id, instance_id) => $http.get(`/api/v3/organizations/${org_id}/access_levels/${instance_id}/can_delete_instance/`).then((response) => response.data); + + organization_factory.delete_access_level_instance = (org_id, instance_id) => $http.delete(`/api/v3/organizations/${org_id}/access_levels/${instance_id}/delete_instance/`).then((response) => response.data); + + organization_factory.create_organization_access_level_instance = (org_id, parent_id, name) => $http.post( + `/api/v3/organizations/${org_id}/access_levels/add_instance/`, + { parent_id, name } + ).then((response) => response.data); + + organization_factory.edit_organization_access_level_instance = (org_id, instance_id, name) => $http.put( + `/api/v3/organizations/${org_id}/` + `access_levels/${instance_id}/edit_instance/`, + { name } + ).then((response) => response.data); + /** * updates the role for a user within an org * @param {int} user_id id of user * @param {int} org_id id of organization * @param {str} role role - * @return {promise obj} promise object + * @return {promise obj} promise object */ organization_factory.update_role = (user_id, org_id, role) => $http .put( @@ -70,6 +91,18 @@ angular.module('BE.seed.service.organization', []).factory('organization_service ) .then((response) => response.data); + organization_factory.update_ali = (user_id, org_id, ali_id) => $http + .put( + `/api/v3/users/${user_id}/access_level_instance/`, + { + "access_level_instance_id": ali_id, + }, + { + params: { organization_id: org_id } + } + ) + .then((response) => response.data); + /** * saves the organization settings * @param {obj} org an organization with fields to share between sub-orgs diff --git a/seed/static/seed/js/services/property_measure_service.js b/seed/static/seed/js/services/property_measure_service.js index 196a917e88..7bf5d1c35e 100644 --- a/seed/static/seed/js/services/property_measure_service.js +++ b/seed/static/seed/js/services/property_measure_service.js @@ -8,7 +8,7 @@ angular.module('BE.seed.service.property_measure', []).factory('property_measure const property_measure_factory = {}; property_measure_factory.delete_property_measure = (organization_id, property_view_id, scenario_id, property_measure_id) => $http({ - url: `/api/v3/properties/${property_view_id}/scenarios/${scenario_id}/measures/${property_measure_id}/`, + url: `/api/v3/properties/${property_view_id}/scenarios/${scenario_id}/measures/${property_measure_id}?organization_id=${organization_id}`, method: 'DELETE' }).then((response) => response.data); diff --git a/seed/static/seed/js/services/scenario_service.js b/seed/static/seed/js/services/scenario_service.js index 188932ca3b..173948d1b8 100644 --- a/seed/static/seed/js/services/scenario_service.js +++ b/seed/static/seed/js/services/scenario_service.js @@ -8,7 +8,7 @@ angular.module('BE.seed.service.scenario', []).factory('scenario_service', [ const scenario_service = {}; scenario_service.delete_scenario = (organization_id, property_view_id, scenario_id) => $http({ - url: `/api/v3/properties/${property_view_id}/scenarios/${scenario_id}/`, + url: `/api/v3/properties/${property_view_id}/scenarios/${scenario_id}?organization_id=${organization_id}`, method: 'DELETE' }).then((response) => response.data); diff --git a/seed/static/seed/js/services/simple_modal_service.js b/seed/static/seed/js/services/simple_modal_service.js index 6c15172037..b9819f9453 100644 --- a/seed/static/seed/js/services/simple_modal_service.js +++ b/seed/static/seed/js/services/simple_modal_service.js @@ -96,6 +96,7 @@ angular.module('BE.seed.service.simple_modal', []).factory('simple_modal_service */ function showModal(customModalOptions, customModalDefaults) { if (customModalOptions && customModalOptions.type !== null) { + if (!_.includes(validModalTypes, customModalOptions.type)) { throw new Error('Invalid modal type'); } diff --git a/seed/static/seed/js/services/uploader_service.js b/seed/static/seed/js/services/uploader_service.js index 0e7bf5c706..02c481424a 100644 --- a/seed/static/seed/js/services/uploader_service.js +++ b/seed/static/seed/js/services/uploader_service.js @@ -81,6 +81,17 @@ angular.module('BE.seed.service.uploader', []).factory('uploader_service', [ ) .then((response) => response.data); + /** + * save_access_level_instance_data + * This service call will call a view on the backend to save access level instance data + * as a background task + * @param filename: the filepath of the uploaded tempfile (this is not an ImportFile!) + */ + uploader_factory.save_access_level_instance_data = (filename, org_id) => // TODO: is this the correct way to get the organization ID? I feel like we should check it + $http.post(`/api/v3/organizations/${org_id}/access_levels/start_save_data/`, { + filename + }).then((response) => response.data); + /** * check_progress: gets the progress for saves, maps, and matches * @param progress_key: progress_key to grab the progress diff --git a/seed/static/seed/js/services/user_service.js b/seed/static/seed/js/services/user_service.js index 91b2818e4c..1ee3df4a45 100644 --- a/seed/static/seed/js/services/user_service.js +++ b/seed/static/seed/js/services/user_service.js @@ -11,6 +11,7 @@ angular.module('BE.seed.service.user', []).factory('user_service', [ const urls = generated_urls; let organization; + let access_level_instance; let user_id; /** @@ -28,6 +29,13 @@ angular.module('BE.seed.service.user', []).factory('user_service', [ user_role: window.BE.initial_org_user_role }; + user_factory.get_access_level_instance = () => access_level_instance ?? { + id: window.BE.access_level_instance_id, + name: window.BE.access_level_instance_name, + is_ali_root: window.BE.is_ali_root, + is_ali_leaf: window.BE.is_ali_leaf + }; + /** * sets the current organization * @param {obj} org @@ -43,7 +51,10 @@ angular.module('BE.seed.service.user', []).factory('user_service', [ params: { organization_id: org.id } } ) - .then((response) => response.data)); + .then(({ data }) => { + access_level_instance = data.user.access_level_instance; + return data; + })); }; user_factory.get_users = () => $http.get('/api/v3/users/').then((response) => response.data); @@ -54,7 +65,8 @@ angular.module('BE.seed.service.user', []).factory('user_service', [ last_name: user.last_name, email: user.email, org_name: user.org_name, - role: user.role + role: user.role, + access_level_instance_id: user.access_level_instance_id }; const params = {}; diff --git a/seed/static/seed/locales/en_US.json b/seed/static/seed/locales/en_US.json index 3c9a46b919..088e5c898a 100644 --- a/seed/static/seed/locales/en_US.json +++ b/seed/static/seed/locales/en_US.json @@ -14,7 +14,18 @@ "A Custom Report allows you to look at aggregated data across your inventories and cycles. This is useful to see how specific metrics change over time.": "A Custom Report allows you to look at aggregated data across your inventories and cycles. This is useful to see how specific metrics change over time.", "A list of your imported headers.": "A list of your imported headers.", "A preview of your concatenated data will appear in the box below.": "A preview of your concatenated data will appear in the box below.", + "ACCESS_LEVEL_DELETE_AREYOUSURE": "Are you sure you want to delete this Access Level Instance? The operation will also delete all Access Level Instances below this one.", + "ACCESS_LEVEL_DESCRIPTION": " Define access levels to structure your organization's content. An organization can have one or more access levels. All organizations have at least one level (level 1), which is named with the organization name by default. All access level names are customizable.", "ACCESS_LEVEL_FILENAME_UPLOADED": "Access Level Instances File has been uploaded", + "ACCESS_LEVEL_INSTANCE_DESCRIPTION": "Access level instances are custom subgroups that can be defined within each access level. These ALIs are used to associate content together and restrict user access to data. There is a single ALI in level 1 of the hierarchy, the root of the tree. This is named 'root' by default, but can be customized. All other levels can contain one or more ALIs.", + "ACCESS_LEVEL_ORG_OWNER": "As an organization owner, you can set the structure of your access level tree using the buttons below. This process should be performed prior to importing data and adding users to your organization.", + "ACCESS_LEVEL_OWNER_END": "Once you have configured your organization's access level tree, you are ready to add users and properties to different levels of the tree.", + "ACCESS_LEVEL_OWNER_STEP1": "Configure the number and name of your access levels using the Edit\/Add Access Levels button.", + "ACCESS_LEVEL_OWNER_STEP2": "Upload a spreadsheet of access level instances. The spreadsheet should have a column for each access level, with the header matching your customized level name. Access level instances make up the rows of the spreadsheet. Make sure to fully define the path of each access level instance. You can also select the level, parent access level instance, and configure the name of a single new access level instance using the Add Access Level Instance button.", + "ACCESS_LEVEL_ROOT_TEXT": "There is only one access level instance allowed at the root of the tree (level 1). Click on the pencil icon if you wish to rename it.", + "ACCESS_LEVEL_STRUCTURE_UPLOAD_TEXT": "Upload your Organizational Structure in spreadsheet form. The file should include a column for each access level with its column header equal to the custom access level name. Each row should contain an access level instance, with its ancestry fully defined (parent node name, grand-parent node name, etc.)", + "ACCESS_LEVEL_TREE_HELP_1": "This page allows you to view the structure of your organization's content. The structure is made up of hierarchical levels that define a tree; these are called access levels. Each level contains one or more nodes, called access level instances. Permissions are managed by associating content and users with a particular access level instance, thereby grouping and restricting access to the content. The number of access levels in your structure, the names of the levels, and the names of the access level instances are customizable.", + "ACCESS_LEVEL_UPLOAD_PROGRESS_MSG": "Saving access level instances in progress... This process depends on the size of your file and may take several minutes.", "ADD_FILES_TO": "Add files to {dataset_name}.", "ADD_REMOVE_LABELS_FROM_PROPERTIES": "Add or remove labels from {num, plural, one{1 selected property} other{# selected properties}}", "ADD_REMOVE_LABELS_FROM_TAXLOTS": "Add or remove labels from {num, plural, one{1 selected tax lot} other{# selected tax lots}}", @@ -36,6 +47,15 @@ "About SEED Platform™": "About SEED Platform™", "Accept": "Accept", "Accept Terms of Service?": "Accept Terms of Service?", + "Access Level": "Access Level", + "Access Level Instance": "Access Level Instance", + "Access Level Instance Information": "Access Level Instance Information", + "Access Level Instance Tree": "Access Level Instance Tree", + "Access Level Instances Errors": "Access Level Instances Errors", + "Access Level Tree": "Access Level Tree", + "Access Levels": "Access Levels", + "Access Levels (AL)": "Access Levels (AL)", + "Access Levels Instances (ALI)": "Access Levels Instances (ALI)", "Acknowledge": "Acknowledge", "Actions": "Actions", "Active": "Active", @@ -43,9 +63,12 @@ "Actual Column": "Actual Column", "Actual Field": "Actual Field", "Add": "Add", + "Add Access Level": "Add Access Level", "Add Column": "Add Column", "Add Data Files": "Add Data Files", "Add Label": "Add Label", + "Add Level Instance (Node) to the Organizational Structure": "Add Level Instance (Node) to the Organizational Structure", + "Add Levels to the Organizational Structure Tree": "Add Levels to the Organizational Structure Tree", "Add Mapping": "Add Mapping", "Add Shared Properties": "Add Shared Properties", "Add Shared Tax Lots": "Add Shared Tax Lots", @@ -86,6 +109,8 @@ "Are you sure you want to unmerge these properties and then merge with the selected properties?": "Are you sure you want to unmerge these properties and then merge with the selected properties?", "Are you sure you want to unmerge these tax lots and then merge with the selected tax lots?": "Are you sure you want to unmerge these tax lots and then merge with the selected tax lots?", "Area": "Area", + "Area Column": "Area Column", + "Area Target Column": "Area Target Column", "As the admin of your SEED instance you can control what data is shared throughout your organization and between your sub-organizations as well as what data is shared externally with the public-at-large. The subset of data you choose to share with the public can be different than the subset shared between your sub-organizations.": "As the admin of your SEED instance you can control what data is shared throughout your organization and between your sub-organizations as well as what data is shared externally with the public-at-large. The subset of data you choose to share with the public can be different than the subset shared between your sub-organizations.", "Associated Building Tax Lot ID": "Associated Building Tax Lot ID", "Associated Tax Lot ID": "Associated Tax Lot ID", @@ -105,6 +130,7 @@ "Back to Home": "Back to Home", "Back to List": "Back to List", "Back to Mapping": "Back to Mapping", + "Baseline Cycle": "Baseline Cycle", "Benchmarking": "Benchmarking", "Block Number": "Block Number", "Body": "Body", @@ -137,6 +163,7 @@ "COMPLETE_AND_REFRESH": "Complete and Refresh Page", "CONFIGURE_PROGRAM": "Need to configure your Program?", "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", "CONTINUE": "Continue", "CONTINUE_QUESTION": "Are you sure you want to continue?", @@ -147,6 +174,7 @@ "Campus": "Campus", "Cancel": "Cancel", "Cannot delete protected objects while related objects still exist": "Cannot delete protected objects while related objects still exist", + "Cannot delete this access level instance.": "Cannot delete this access level instance.", "Change Merged Property": "Change Merged Property", "Change Merged Tax Lot": "Change Merged Tax Lot", "Change Password": "Change Password", @@ -190,6 +218,7 @@ "Condition Check": "Condition Check", "Conditioned Floor Area": "Conditioned Floor Area", "Configuration": "Configuration", + "Configure Goals": "Configure Goals", "Confirm": "Confirm", "Confirm Audit Template Building Import?": "Confirm Audit Template Building Import?", "Confirm Save Mappings?": "Confirm Save Mappings?", @@ -235,16 +264,20 @@ "Created": "Created", "Cross-Cycles": "Cross-Cycles", "Current Column Mapping Profile": "Current Column Mapping Profile", + "Current Cycle": "Current Cycle", + "Current Cycle will be measured against Baseline Cycle": "Current Cycle will be measured against Baseline Cycle", "Current Filters": "Current Filters", "Current Name": "Current Name", "Current password": "Current password", "Custom ID 1": "Custom ID 1", "Custom ID 1 (Property)": "Custom ID 1 (Property)", "Custom ID 1 (Tax Lot)": "Custom ID 1 (Tax Lot)", + "Custom Name for Level": "Custom Name for Level", "Custom Reports": "Custom Reports", "Custom emails can be sent to Building Owners using the templates defined below. The email will be sent to the SEED record's Owner Email address and is currently not configurable. The email 'from' address is the same as the server email address which is also used to email users their account information.": "Custom emails can be sent to Building Owners using the templates defined below. The email will be sent to the SEED record's Owner Email address and is currently not configurable. The email 'from' address is the same as the server email address which is also used to email users their account information.", "Cycle": "Cycle", "Cycle Name": "Cycle Name", + "Cycle Selection": "Cycle Selection", "Cycle updated.": "Cycle updated.", "Cycle:": "Cycle:", "Cycles": "Cycles", @@ -291,6 +324,7 @@ "Default Data Administrator Account Name": "Default Data Administrator Account Name", "Default Display Fields": "Default Display Fields", "Delete": "Delete", + "Delete Access Level Instance": "Delete Access Level Instance", "Delete All Mappings": "Delete All Mappings", "Delete Indication Label After Successful Salesforce Update": "Delete Indication Label After Successful Salesforce Update", "Delete Organization": "Delete Organization", @@ -337,9 +371,11 @@ "ESPM_FILE_UPLOAD": "ESPM Spreadsheet Upload (xlsx). The spreadsheet should contain a single property.", "ESPM_IMPORT_TEXT": "Choose an EnergyStar Portfolio Manager (ESPM) data importing method below: you can either upload a property spreadsheet previously downloaded from ESPM, or you can connect to ESPM directly to access the data.", "EUI": "EUI", + "EUI Target Columns": "EUI Target Columns", "EXCLUDE": "EXCLUDE", "EXTRA_DATA_COL_TYPE_CHANGE": "For “extra data” fields, this allows the user to set the type, such as Text, Number, Date, etc.", "Edit": "Edit", + "Edit Access Level Instance Name": "Edit Access Level Instance Name", "Edit Name": "Edit Name", "Edit UBIDs": "Edit UBIDs", "Email": "Email", @@ -356,6 +392,7 @@ "Energy data file": "Energy data file", "English": "English", "Enter Email Address": "Enter Email Address", + "Enter a Name for the new Access Level Instance": "Enter a Name for the new Access Level Instance", "Enter a valid email address.": "Enter a valid email address.", "Enter email address": "Enter email address", "Enter first name": "Enter first name", @@ -365,6 +402,7 @@ "Enter the minimum threshold count of buildings that can be returned in a shared query. The building count threshold is important for allowing other organizations to perform statistical analysis on your data without revealing information about individual buildings.": "Enter the minimum threshold count of buildings that can be returned in a shared query. The building count threshold is important for allowing other organizations to perform statistical analysis on your data without revealing information about individual buildings.", "Error": "Error", "Error Processing Data": "Error Processing Data", + "Example Access Level Tree": "Example Access Level Tree", "Example Usage": "Example Usage", "Existing Audit Template Properties (skipped)": "Existing Audit Template Properties (skipped)", "Existing Cycles": "Existing Cycles", @@ -437,6 +475,8 @@ "GEOCODING_NEEDS_THREE_COLS": "Note, geocoding requires at least 1 column is used and populated to construct full addresses.", "GEOCODING_NOW": "Geocoding now...", "GJ\/m²\/year": "GJ\/m²\/year", + "GOAL": "GOAL", + "GOAL_SETUP_TEXT": "Configure one or more portfolio Energy Use Intensity (EUI) reduction goals below. Select a baseline cycle and a current cycle for comparison, indicate the level in your access level tree that this goal applies to, specify a percentage EUI improvement target, and indicate which fields in your data should be used for EUI and square footage information.", "GREENBUTTON_CONTENTS_TITLE": "Confirm GreenButton File Contents", "Generate Token": "Generate Token", "Geocode": "Geocode", @@ -452,12 +492,15 @@ "Go to Detail Page": "Go to Detail Page", "Go to Meters": "Go to Meters", "Go to Notes": "Go to Notes", + "Goal Setup": "Goal Setup", "Gross Floor Area": "Gross Floor Area", "HOW THE SYSTEM AUTO-MATCHES YOUR PROPERTIES AND TAX LOTS:": "HOW THE SYSTEM AUTO-MATCHES YOUR PROPERTIES AND TAX LOTS:", "HOW TO MANUALLY MATCH YOUR PROPERTIES AND TAX LOTS:": "HOW TO MANUALLY MATCH YOUR PROPERTIES AND TAX LOTS:", "HOW_SYSTEM_AUTO_MATCHES_EXPLANATION": "Your source data file(s) are presented in the table on the left. All properties\/tax lots where a possible data match exists are presented in a table on the right. The system attempts to auto-match records using shared unique IDs like: PM Property ID, Jurisdiction Tax Lot ID, and Custom IDs as well as Address information. Where the system believes a match exists between a record in your source file and an existing record it will auto-check the 'match' <\/i> checkbox — effectively making a match between these records.", "HTTP Error! Status Code: 404. The requested URL was not found.": "HTTP Error! Status Code: 404. The requested URL was not found.", "HTTP Error! Status Code: 500. Internal Server Error.": "HTTP Error! Status Code: 500. Internal Server Error.", + "Have your organization owner update the column's data type to \"Area\"": "Have your organization owner update the column's data type to \"Area\"", + "Have your organization owner update the data type of the column to \"EUI\"": "Have your organization owner update the data type of the column to \"EUI\"", "Hello %(first_name)s, ": "Hello %(first_name)s, ", "Hexagonal Bins": "Hexagonal Bins", "Highlights of SEED Platform™": "Highlights of SEED Platform™", @@ -530,6 +573,9 @@ "Latitude": "Latitude", "Left Axis": "Left Axis", "Left Half": "Left Half", + "Level": "Level", + "Level Instance": "Level Instance", + "Loading Summary Data...": "Loading Summary Data...", "Loading data...": "Loading data...", "Loading labels...": "Loading labels...", "Loading...": "Loading...", @@ -568,6 +614,7 @@ "Manage available cycles.": "Manage available cycles.", "Manage compliance": "Manage compliance", "Managed by": "Managed by", + "Managing the Access Level Tree": "Managing the Access Level Tree", "Manual Matching": "Manual Matching", "Map": "Map", "Map SEED fields to imported file fields": "Map SEED fields to imported file fields", @@ -642,6 +689,7 @@ "Name": "Name", "National Renewable Energy Laboratory": "National Renewable Energy Laboratory", "New Analysis": "New Analysis", + "New Goal": "New Goal", "New Note": "New Note", "New User Email": "New User Email", "New password": "New password", @@ -663,6 +711,7 @@ "Not Compliant": "Not Compliant", "Not Null": "Not Null", "Not all inventory items were successfully deleted": "Not all inventory items were successfully deleted", + "Not seeing your column?": "Not seeing your column?", "Note:": "Note:", "Note: Meters are labeled with the following format: \"Type - Source - Source ID\"": "Note: Meters are labeled with the following format: \"Type - Source - Source ID\"", "Note: Parent organization members are not automatically made members of sub-organizations.": "Note: Parent organization members are not automatically made members of sub-organizations.", @@ -709,6 +758,7 @@ "PM_METER_IMPORT_NO_ASSOCIATION": "Unable to Import - No associations to previously imported properties", "PM_METER_IMPORT_RESULTS": "Portfolio Manager Meter Import Results", "PM_PROPERTY_ID_MATCHING_CRITERIA_WARNING": "Removing PM Property ID from matching criteria can cause unexpected issues for Portfolio Manager Meter imports.", + "PORTFOLIO_SUMMARY_HEADER_TEXT": "The portfolio summary page compares 2 cycles to calculate progress toward an Energy Use Intensity reduction goal. Cycle selection and goal details can be customized by clicking the Configure Goals button below.", "POST_GEOCODING_COUNTS": "Updated counts after geocoding", "PROPERTY_MATCHING_FIELDS_REQUIREMENT": "At least one of the following Property fields is required", "PUBLIC": "PUBLIC", @@ -736,6 +786,9 @@ "Please visit our User Support website for tutorials and documentation to help you learn how to use SEED-Platform.": "Please visit our User Support website for tutorials and documentation to help you learn how to use SEED-Platform.", "Please wait while your data is loaded...": "Please wait while your data is loaded...", "Populate SEED Headers with best known matches": "Populate SEED Headers with best known matches", + "Portfolio Summary": "Portfolio Summary", + "Portfolio Summary will only include properties belonging to this Access Level Instance.": "Portfolio Summary will only include properties belonging to this Access Level Instance.", + "Portfolio Target": "Portfolio Target", "Postal Code": "Postal Code", "Postal Code (Property)": "Postal Code (Property)", "Postal Code (Tax Lot)": "Postal Code (Tax Lot)", @@ -745,6 +798,7 @@ "Preview": "Preview", "Preview Loading": "Preview Loading", "Previous": "Previous", + "Primary Column": "Primary Column", "Primary Tax Lot ID": "Primary Tax Lot ID", "Primary\/Secondary": "Primary\/Secondary", "Profile Info": "Profile Info", @@ -791,6 +845,7 @@ "RENAME_COLUMN_TITLE": "Rename Column", "RENAME_SYS_LEVEL_COL": "Rename allows users to change the name of the underlying field shown in Column Name \/ Field Name. Renaming a field means that field will be changed in all the data for the organization.", "REVIEW YOUR DATA MAPPINGS": "REVIEW YOUR DATA MAPPINGS", + "REVIEW_MATCHING_CRITERIA": "Review your matching criteria on the Column Settings page before importing data for the first time. You will not be able to remove fields from the matching criteria after data is added to your organization.", "Read more here.": "Read more here.", "Really reset all passwords? This will sign you out of SEED.": "Really reset all passwords? This will sign you out of SEED.", "Recent Sale Date": "Recent Sale Date", @@ -802,6 +857,7 @@ "Related Properties": "Related Properties", "Related Tax Lots": "Related Tax Lots", "Remove": "Remove", + "Remove Access Level": "Remove Access Level", "Remove Column Mappings": "Remove Column Mappings", "Remove From Project": "Remove From Project", "Remove Inventory": "Remove Inventory", @@ -903,6 +959,7 @@ "SHOWING_UNFILTERED_TAXLOTS": "Showing {start} to {end} of {total} tax lots", "STEP 1: Map Your Data": "STEP 1: Map Your Data", "STEP 2: Review Your Data Mappings": "STEP 2: Review Your Data Mappings", + "SUB_ORG_DEPRECATION": "The Sub-Organization functionality is no longer recommended and will be deprecated soon. Visit the Access Level Tree page to define access levels to structure your organization's content.", "SUGGEST_TO_VERIFY": "Please verify before continuing.", "SUGGEST_UPDATE_GEOCODE_COLS": "Update the geocoding column settings in your organization's column settings page.", "Salesforce": "Salesforce", @@ -923,6 +980,7 @@ "Search display name": "Search display name", "Search field name": "Search field name", "Search table name": "Search table name", + "Secondary (optional)": "Secondary (optional)", "Security": "Security", "Security Token": "Security Token", "SeedOrg": "SeedOrg", @@ -938,6 +996,8 @@ "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.", "Select columns from the lists below to make them appear on the left or right halves of your Matching List table. Drag the rows to change the order in which they appear.": "Select columns from the lists below to make them appear on the left or right halves of your Matching List table. Drag the rows to change the order in which they appear.", "Select one or more filter groups to load your inventory.": "Select one or more filter groups to load your inventory.", + "Select the Level at which you want to add the new Instance": "Select the Level at which you want to add the new Instance", + "Select the new Instance's Parent Access Level Instance": "Select the new Instance's Parent Access Level Instance", "Select the type of file(s) you would like to add to": "Select the type of file(s) you would like to add to", "Select which columns to include in the list:": "Select which columns to include in the list:", "Selected Properties": "Selected Properties", @@ -980,6 +1040,8 @@ "State": "State", "State (Property)": "State (Property)", "State (Tax Lot)": "State (Tax Lot)", + "Step 1: Add Access Levels": "Step 1: Add Access Levels", + "Step 2: Upload Access Level Instances": "Step 2: Upload Access Level Instances", "Sub-Org Name": "Sub-Org Name", "Sub-Org name is required.": "Sub-Org name is required.", "Sub-Organization Name": "Sub-Organization Name", @@ -1002,6 +1064,7 @@ "Target >= Actual for Compliance": "Target >= Actual for Compliance", "Target Column": "Target Column", "Target Field": "Target Field", + "Target to quantify Portfolio EUI improvement. Must be between 0 and 100.": "Target to quantify Portfolio EUI improvement. Must be between 0 and 100.", "Tax Lot": "Tax Lot", "Tax Lot Count": "Tax Lot Count", "Tax Lot Detail": "Tax Lot Detail", @@ -1017,6 +1080,7 @@ "Taxlot Display Field": "Taxlot Display Field", "Terms of Service": "Terms of Service", "Terms of Service as of %(tos.created|date:\"SHORT_DATE_FORMAT\")s": "Terms of Service as of %(tos.created|date:\"SHORT_DATE_FORMAT\")s", + "Tertiary (optional)": "Tertiary (optional)", "Test Connection": "Test Connection", "Text": "Text", "Thank you": "Thank you", @@ -1041,7 +1105,7 @@ "The password link was invalid, possibly because it has already been used. Please request a new password reset.": "The password link was invalid, possibly because it has already been used. Please request a new password reset.", "There is also a link to the SEED-Platform Users forum, where you can connect with other users.": "There is also a link to the SEED-Platform Users forum, where you can connect with other users.", "There was an error loading the page": "There was an error loading the page", - "This action replaces any of your current columns with the comma-delmited columns you provided. Would you like to continue?": "This action replaces any of your current columns with the comma-delmited columns you provided. Would you like to continue?", + "This action replaces any of your current columns with the comma-delimited columns you provided. Would you like to continue?": "This action replaces any of your current columns with the comma-delimited columns you provided. Would you like to continue?", "This action updates properties within the selected cycle with data from the Audit Template account associated with this organization. Only Properties with Audit Template Building IDs corresponding to those saved in Audit Template will be updated.": "This action updates properties within the selected cycle with data from the Audit Template account associated with this organization. Only Properties with Audit Template Building IDs corresponding to those saved in Audit Template will be updated.", "This cycle name is already taken.": "This cycle name is already taken.", "This email link is invalid.": "This email link is invalid.", @@ -1106,6 +1170,8 @@ "Update Property Labels": "Update Property Labels", "Update Salesforce": "Update Salesforce", "Update UBID": "Update UBID", + "Update the data type of the column to \"Area\" in": "Update the column's data type to \"Area\" in", + "Update the data type of the column to \"EUI\" in": "Update the data type of the column to \"EUI\" in", "Update with Audit Template": "Update with Audit Template", "Update with BuildingSync": "Update with BuildingSync", "Update with ESPM": "Update with ESPM", @@ -1242,6 +1308,7 @@ "ex: joe@company.com": "ex: joe@company.com", "first name": "first name", "for your SEED Platform user account": "for your SEED Platform user account", + "goal": "Goal", "gray": "gray", "green": "green", "has been uploaded to": "has been uploaded to", diff --git a/seed/static/seed/locales/fr_CA.json b/seed/static/seed/locales/fr_CA.json index fac5f1c5c1..5f871b0eb0 100644 --- a/seed/static/seed/locales/fr_CA.json +++ b/seed/static/seed/locales/fr_CA.json @@ -14,7 +14,18 @@ "A Custom Report allows you to look at aggregated data across your inventories and cycles. This is useful to see how specific metrics change over time.": "Un rapport personnalisé vous permet de consulter des données agrégées sur vos inventaires et vos cycles. Ceci est utile pour voir comment des métriques spécifiques changent au fil du temps.", "A list of your imported headers.": "Une liste de vos en-têtes importés.", "A preview of your concatenated data will appear in the box below.": "Un aperçu de vos données concaténées apparaîtra dans la case ci-dessous.", + "ACCESS_LEVEL_DELETE_AREYOUSURE": "Êtes-vous sûr de vouloir supprimer cette instance de niveau d'accès ? L'opération supprimera également toutes les instances de niveau d'accès inférieures à celle-ci.", + "ACCESS_LEVEL_DESCRIPTION": "Définissez des niveaux d'accès pour structurer le contenu de votre organisation. Une organisation peut avoir un ou plusieurs niveaux d'accès. Toutes les organisations ont au moins un niveau (niveau 1), nommé par défaut avec le nom de l'organisation. Tous les noms de niveaux d'accès sont personnalisables.", "ACCESS_LEVEL_FILENAME_UPLOADED": "Le fichier d'instances de niveau d'accès a été téléchargé", + "ACCESS_LEVEL_INSTANCE_DESCRIPTION": "Les instances de niveau d'accès sont des sous-groupes personnalisés qui peuvent être définis au sein de chaque niveau d'accès. Ces ALI sont utilisées pour associer du contenu et restreindre l'accès des utilisateurs aux données. Il existe une seule ALI au niveau 1 de la hiérarchie, la racine du graphe en arbre. Celui-ci est nommé « racine » par défaut, mais peut être personnalisé. Tous les autres niveaux peuvent contenir une ou plusieurs ALI.", + "ACCESS_LEVEL_ORG_OWNER": "En tant que propriétaire d'une organisation, vous pouvez définir la structure de votre graphe en arbre de niveaux d'accès à l'aide des boutons ci-dessous. Ce processus doit être effectué avant d'importer des données et d'ajouter des utilisateurs à votre organisation.", + "ACCESS_LEVEL_OWNER_END": "Une fois que vous avez configuré le graphe en arbre des niveaux d'accès de votre organisation, vous êtes prêt à ajouter des utilisateurs et des propriétés aux différents niveaux de l'arbre.", + "ACCESS_LEVEL_OWNER_STEP1": "Configurez le numéro et le nom de vos niveaux d'accès à l'aide du bouton Modifier\/Ajouter des niveaux d'accès.", + "ACCESS_LEVEL_OWNER_STEP2": "Téléchargez une feuille de calcul des instances de niveau d'accès. La feuille de calcul doit avoir un colonne pour chaque niveau d'accès, avec l'en-tête correspondant à votre nom de niveau personnalisé. Les instances de niveau d'accès constituent les lignes de la feuille de calcul. Assurez-vous de définir entièrement le chemin de chaque instance de niveau d’accès. Vous pouvez également sélectionner le niveau, l'instance de niveau d'accès parent et configurer le nom d'une seule nouvelle instance de niveau d'accès à l'aide du bouton Ajouter une instance de niveau d'accès.", + "ACCESS_LEVEL_ROOT_TEXT": "Il n'y a qu'une seule instance de niveau d'accès autorisée à la racine du graphe en arbre (niveau 1). Cliquez sur l'icône en forme de crayon si vous souhaitez le renommer.", + "ACCESS_LEVEL_STRUCTURE_UPLOAD_TEXT": "Téléchargez votre structure organisationnelle sous forme de feuille de calcul. Le fichier doit inclure une colonne pour chaque niveau d'accès avec son en-tête de colonne égal au nom du niveau d'accès personnalisé. Chaque ligne doit contenir une instance de niveau d'accès, avec son ascendance entièrement définie (nom du nœud parent, nom du nœud grand-parent, etc.)", + "ACCESS_LEVEL_TREE_HELP_1": "Cette page vous permet de visualiser la structure du contenu de votre organisation. La structure est constituée de niveaux hiérarchiques qui définissent une arborescence ; c'est ce qu'on appelle les niveaux d'accès. Chaque niveau contient un ou plusieurs nœuds, appelés instances de niveau d'accès. Les autorisations sont gérées en associant le contenu et les utilisateurs à une instance de niveau d'accès particulière, regroupant et restreignant ainsi l'accès au contenu. Le nombre de niveaux d'accès dans votre structure, les noms des niveaux et les noms des instances de niveau d'accès sont personnalisables.", + "ACCESS_LEVEL_UPLOAD_PROGRESS_MSG": "Enregistrement des instances de niveau d'accès en cours... Ce processus dépend de la taille de votre fichier et peut prendre plusieurs minutes.", "ADD_FILES_TO": "Ajoutez des fichiers à {dataset_name}.", "ADD_REMOVE_LABELS_FROM_PROPERTIES": "Ajouter ou supprimer des étiquettes de {num, plural, one{1 propriété sélectionnée} other{# propriétés sélectionnées}}", "ADD_REMOVE_LABELS_FROM_TAXLOTS": "Ajouter ou supprimer des étiquettes de {num, plural, one{1 lot d'impôt sélectionné} other{# lots d'impôt sélectionnés}}", @@ -36,6 +47,15 @@ "About SEED Platform™": "À propos de SEED Platform™", "Accept": "Acceptez", "Accept Terms of Service?": "Accepter les conditions d'utilisation?", + "Access Level": "Niveau d'accès", + "Access Level Instance": "Instance de niveau d'accès", + "Access Level Instance Information": "Informations sur l'instance de niveau d'accès", + "Access Level Instance Tree": "Graphe en arbre des instances de niveau d'accès", + "Access Level Instances Errors": "Erreurs d’instances de niveau d’accès", + "Access Level Tree": "Graphe en arbre des niveaux d'accès", + "Access Levels": "Niveaux d'accès", + "Access Levels (AL)": "Niveaux d'accès (AL)", + "Access Levels Instances (ALI)": "Instances de niveaux d'accès (ALI)", "Acknowledge": "Reconnaître", "Actions": "Actions", "Active": "actif", @@ -43,9 +63,12 @@ "Actual Column": "Colonne réelle", "Actual Field": "Champ réel", "Add": "Ajouter", + "Add Access Level": "Ajouter un niveau d'accès", "Add Column": "Ajouter une colonne", "Add Data Files": "Ajouter des fichiers de données", "Add Label": "Ajouter une étiquette", + "Add Level Instance (Node) to the Organizational Structure": "Ajouter une instance de niveau (nœud) à la structure organisationnelle", + "Add Levels to the Organizational Structure Tree": "Ajouter des niveaux à l'arbre de la structure organisationnelle", "Add Mapping": "Ajouter une configuration", "Add Shared Properties": "Ajouter des propriétés partagées", "Add Shared Tax Lots": "Ajouter des lots d'impôt partagés", @@ -86,6 +109,8 @@ "Are you sure you want to unmerge these properties and then merge with the selected properties?": "Êtes-vous sûr de vouloir annuler la fusion de ces propriétés et fusionner avec les propriétés sélectionnées?", "Are you sure you want to unmerge these tax lots and then merge with the selected tax lots?": "Êtes-vous sûr de vouloir annuler la fusion de ces lots fiscaux pour ensuite fusionner avec les lots d'impôt sélectionnés?", "Area": "Superficie", + "Area Column": "Colonne de Superficie", + "Area Target Column": "Colonne Cible de Superficie", "As the admin of your SEED instance you can control what data is shared throughout your organization and between your sub-organizations as well as what data is shared externally with the public-at-large. The subset of data you choose to share with the public can be different than the subset shared between your sub-organizations.": "En tant qu'administrateur de votre instance SEED, vous pouvez contrôler les données partagées dans votre organisation et entre vos sous-organisations ainsi que les données partagées à l'externe avec le public. Le sous-ensemble de données que vous choisissez de partager avec le public peut être différent du sous-ensemble partagé entre vos sous-organisations.", "Associated Building Tax Lot ID": "ID de lot d'impôt du bâtiment associé", "Associated Tax Lot ID": "ID de lot d'impôt associé", @@ -105,6 +130,7 @@ "Back to Home": "Retour à l'Accueil", "Back to List": "Retour à la Liste", "Back to Mapping": "Retournez à les mappages", + "Baseline Cycle": "Cycle de référence", "Benchmarking": "Analyse comparative", "Block Number": "Numéro de bloc", "Body": "Corps", @@ -137,6 +163,7 @@ "COMPLETE_AND_REFRESH": "Complétez et Actualisez la Page", "CONFIGURE_PROGRAM": "Besoin de configurer votre programme?", "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", "CONTINUE": "Continuer", "CONTINUE_QUESTION": "Es-tu sur de vouloir continuer?", @@ -147,6 +174,7 @@ "Campus": "Campus", "Cancel": "Annuler", "Cannot delete protected objects while related objects still exist": "Impossible de supprimer des objets protégés alors que des objets apparentés existent toujours", + "Cannot delete this access level instance.": "Impossible de supprimer cette instance de niveau d'accès.", "Change Merged Property": "Modifier la propriété fusionnée", "Change Merged Tax Lot": "Modifier le lot d'impôt fusionnée", "Change Password": "Changer le mot de passe", @@ -190,6 +218,7 @@ "Condition Check": "Vérification de l'état", "Conditioned Floor Area": "Surface climatisé", "Configuration": "Configuration", + "Configure Goals": "Configurer les Objectifs", "Confirm": "Confirmer", "Confirm Audit Template Building Import?": "Confirmer l'importation de la création du modèle d'audit ?", "Confirm Save Mappings?": "Confirmer enregistrer les mappages?", @@ -235,16 +264,20 @@ "Created": "Créé", "Cross-Cycles": "Entre les Cycles", "Current Column Mapping Profile": "Profil de mappage de colonne actuel", + "Current Cycle": "Cycle actuel", + "Current Cycle will be measured against Baseline Cycle": "Le cycle actuel sera mesuré par rapport au cycle de référence", "Current Filters": "Filtres Actuel", "Current Name": "Nom Actuel", "Current password": "Mot de passe actuel", "Custom ID 1": "ID personnalisée 1", "Custom ID 1 (Property)": "ID personnalisé 1 (propriété)", "Custom ID 1 (Tax Lot)": "ID personnalisé 1 (lot d'impôt)", + "Custom Name for Level": "Nom personnalisé pour le niveau", "Custom Reports": "Rapports", "Custom emails can be sent to Building Owners using the templates defined below. The email will be sent to the SEED record's Owner Email address and is currently not configurable. The email 'from' address is the same as the server email address which is also used to email users their account information.": "Des e-mails personnalisés peuvent être envoyés aux propriétaires d'immeubles à l'aide des modèles définis ci-dessous. L'e-mail sera envoyé à l'adresse e-mail du propriétaire de l'enregistrement SEED et n'est actuellement pas configurable. L'adresse e-mail \"de\" est la même que l'adresse e-mail du serveur qui est également utilisée pour envoyer aux utilisateurs leurs informations de compte par e-mail.", "Cycle": "Cycle", "Cycle Name": "Nom du cycle", + "Cycle Selection": "Sélection des cycles", "Cycle updated.": "Cycle mis à jour.", "Cycle:": "Cycle:", "Cycles": "Cycles", @@ -291,6 +324,7 @@ "Default Data Administrator Account Name": "Nom du compte d'administrateur de données par défaut", "Default Display Fields": "Champs d'affichage par défaut", "Delete": "Supprimer", + "Delete Access Level Instance": "Supprimer une instance de niveau d'accès", "Delete All Mappings": "Supprimer tous les mappages", "Delete Indication Label After Successful Salesforce Update": "Supprimer l'étiquette d'indication après une mise à jour réussie de Salesforce", "Delete Organization": "Supprimer l'organisation", @@ -337,9 +371,11 @@ "ESPM_FILE_UPLOAD": "Téléchargement de la feuille de calcul ESPM (xlsx). La feuille de calcul doit contenir une seule propriété.", "ESPM_IMPORT_TEXT": "Choisissez une méthode d'importation de données EnergyStar Portfolio Manager (ESPM) ci-dessous: vous pouvez soit télécharger une feuille de calcul de propriétés précédemment téléchargée depuis ESPM, soit vous connecter directement à ESPM pour accéder aux données.", "EUI": "IUE", + "EUI Target Columns": "Colonnes cibles EUI", "EXCLUDE": "EXCLURE", "EXTRA_DATA_COL_TYPE_CHANGE": "Pour les champs «données supplémentaires», cela permet à l'utilisateur de définir le type, tel que Texte, Numéro, Date, etc.", "Edit": "Modifier", + "Edit Access Level Instance Name": "Modifier le nom de l'instance du niveau d'accès", "Edit Name": "Modifier le nom", "Edit UBIDs": "Modifier les UBIDs", "Email": "Email", @@ -356,6 +392,7 @@ "Energy data file": "Fichier de données d'énergie", "English": "Anglais", "Enter Email Address": "Entrer l'adresse e-mail", + "Enter a Name for the new Access Level Instance": "Entrez un nom pour la nouvelle instance de niveau d'accès", "Enter a valid email address.": "Entrez une adresse mail valide.", "Enter email address": "Entrer l'adresse e-mail", "Enter first name": "Entrez le prénom", @@ -365,6 +402,7 @@ "Enter the minimum threshold count of buildings that can be returned in a shared query. The building count threshold is important for allowing other organizations to perform statistical analysis on your data without revealing information about individual buildings.": "Entrez le nombre de seuils minimal des bâtiments pouvant être renvoyés dans une requête partagée. Le seuil de nombre de bâtiments est important pour permettre à d'autres organisations d'effectuer une analyse statistique de vos données sans révéler d'informations sur les bâtiments individuels.", "Error": "Erreur", "Error Processing Data": "Erreur lors du traitement des données", + "Example Access Level Tree": "Exemple de graphe en arbre de niveaux d'accès", "Example Usage": "Exemple d'utilisation", "Existing Audit Template Properties (skipped)": "Propriétés du modèle d'audit existant (ignoré)", "Existing Cycles": "Cycles existants", @@ -437,6 +475,8 @@ "GEOCODING_NEEDS_THREE_COLS": "Remarque: le géocodage nécessite l'utilisation d'au moins une colonne et son remplissage pour construire des adresses complètes.", "GEOCODING_NOW": "Géocodage maintenant ...", "GJ\/m²\/year": "GJ\/m²\/année", + "GOAL": "OBJECTIF", + "GOAL_SETUP_TEXT": "Configurez un ou plusieurs objectifs de réduction de l'intensité de l'utilisation d'énergie (IUE) du portefeuille ci-dessous. Sélectionnez un cycle de référence et un cycle actuel à des fins de comparaison, identifiez le niveau dans votre arborescence de niveaux d'accès auquel cet objectif s'applique, spécifiez un objectif d'amélioration de l'IUE en pourcentage et indiquez quels champs de vos données doivent être utilisés pour les informations sur l'IUE et la superficie en pieds carrés.", "GREENBUTTON_CONTENTS_TITLE": "Confirmer le contenu du fichier GreenButton", "Generate Token": "Générer un jeton", "Geocode": "Géocodage", @@ -452,12 +492,15 @@ "Go to Detail Page": "Accéder à la page Détail", "Go to Meters": "Aller aux compteurs", "Go to Notes": "Accéder aux Notes", + "Goal Setup": "Configuration des objectifs", "Gross Floor Area": "Surface brute", "HOW THE SYSTEM AUTO-MATCHES YOUR PROPERTIES AND TAX LOTS:": "COMMENT LE SYSTÈME ADAPTE AUTOMATIQUEMENT VOS PROPRIETES ET LOTS D'IMPÔT:", "HOW TO MANUALLY MATCH YOUR PROPERTIES AND TAX LOTS:": "COMMENT APPORTER MANUELLEMENT VOS PROPRIETES ET LOTS D'IMPÔT:", "HOW_SYSTEM_AUTO_MATCHES_EXPLANATION": "Votre fichier de données source est présenté dans le tableau de gauche. Toutes les propriétés\/lots d'impôt où une correspondance de données possible existe sont présentées dans un tableau sur la droite. Le système tente de faire correspondre automatiquement les enregistrements à l'aide d'ID uniques partagés tels que: ID de Propriété PM, ID de Lot d'Impôt de Juridiction et les ID personnalisés, ainsi que des informations d'adresse. Lorsque le système croit qu'une correspondance existe entre un enregistrement de votre fichier source et un enregistrement existant, il vérifie automatiquement la 'correspondance' <\/i> case à cocher — faire efficacement une correspondance entre ces enregistrements.", "HTTP Error! Status Code: 404. The requested URL was not found.": "Erreur HTTP! Code d'état : 404. L'URL demandée est introuvable.", "HTTP Error! Status Code: 500. Internal Server Error.": "Erreur HTTP! Code d'état : 500. Erreur interne du serveur.", + "Have your organization owner update the column's data type to \"Area\"": "Demandez au propriétaire de votre organisation d s'assurer que le type de données de la colonne est \"Area\" dans", + "Have your organization owner update the data type of the column to \"EUI\"": "Demandez au propriétaire de votre organisation de mettre à jour le type de données de la colonne en \"EUI\".", "Hello %(first_name)s, ": "Bonjour% (first_name) s,", "Hexagonal Bins": "Bacs Hexagonaux", "Highlights of SEED Platform™": "Points forts de la Plate-Forme SEED™", @@ -530,6 +573,9 @@ "Latitude": "Latitude", "Left Axis": "Axe gauche", "Left Half": "Moitié gauche", + "Level": "Niveau", + "Level Instance": "Instance de niveau", + "Loading Summary Data...": "Chargement des données récapitulatives...", "Loading data...": "Chargeant les données ...", "Loading labels...": "Chargement des étiquettes ...", "Loading...": "Chargeant...", @@ -568,6 +614,7 @@ "Manage available cycles.": "Gérer les cycles disponibles.", "Manage compliance": "Gérer la conformité", "Managed by": "Dirigé par", + "Managing the Access Level Tree": "Graphe en arbre des niveaux d'accès", "Manual Matching": "Correspondance manuelle", "Map": "Carte", "Map SEED fields to imported file fields": "Mapper les champs SEED aux champs de fichiers importés", @@ -639,9 +686,10 @@ "NUMBER_OF_TAXLOTS": "{num, plural, one{1 lot d'impôt} other{# lot d'impôts}}", "NUM_PROPERTIES_AND_TAXLOTS_DELETED": "{num_properties,plural,=0{aucune propriété} one{1<\/strong> propriété} other{#<\/strong> propriétés}} et {num_taxlots,plural,=0{aucun lot d'impôt} one{1<\/strong>lot d'impôt} other{#<\/strong> lots d'impôt}} ont été supprimé", "NUM_PROPERTY_TAXLOT_COLUMNS_AVAILABLE": "Il existe {num_property_columns} colonnes de propriétés et {num_taxlot_columns} colonnes de lot d'impôt qui vous sont accessibles.", - "Name": "nom", + "Name": "Nom", "National Renewable Energy Laboratory": "Laboratoire National Des Énergies Renouvelables", "New Analysis": "Nouvelle analyse", + "New Goal": "Nouvel Objectif", "New Note": "Nouvelle note", "New User Email": "E-mail du nouvel utilisateur", "New password": "Nouveau mot de passe", @@ -663,6 +711,7 @@ "Not Compliant": "Non conforme", "Not Null": "Pas nul", "Not all inventory items were successfully deleted": "Tous les éléments de l'inventaire n'ont pas été supprimés", + "Not seeing your column?": "Vous ne voyez pas votre colonne?", "Note:": "Remarque:", "Note: Meters are labeled with the following format: \"Type - Source - Source ID\"": "Remarque: Les compteurs sont étiquetés au format suivant: \"la catégorie - Source - Source ID\"", "Note: Parent organization members are not automatically made members of sub-organizations.": "Remarque: les membres de l'organisation parente ne sont pas automatiquement devenus membres de sous-organisations.", @@ -709,6 +758,7 @@ "PM_METER_IMPORT_NO_ASSOCIATION": "Importation impossible - Aucune association à des propriétés précédemment importées", "PM_METER_IMPORT_RESULTS": "Résultats d'importation de Portfolio Manager", "PM_PROPERTY_ID_MATCHING_CRITERIA_WARNING": "La suppression de l'ID de propriété PM des critères de correspondance peut entraîner des problèmes inattendus pour les importations de compteurs Portfolio Manager.", + "PORTFOLIO_SUMMARY_HEADER_TEXT": "La page de résumé du portefeuille compare 2 cycles pour calculer les progrès vers un objectif de réduction de l'intensité de l'utilisation d'énergie. La sélection du cycle et les détails des objectifs peuvent être personnalisés en cliquant sur le bouton Configurer les Objectifs ci-dessous.", "POST_GEOCODING_COUNTS": "Nombre mis à jour après le géocodage", "PROPERTY_MATCHING_FIELDS_REQUIREMENT": "Au moins un des champs de propriété suivants est requis", "PUBLIC": "PUBLIC", @@ -736,6 +786,9 @@ "Please visit our User Support website for tutorials and documentation to help you learn how to use SEED-Platform.": "S'il vous plaît visitez notre site Web d'assistance aux utilisateurs pour les tutoriels et la documentation pour vous aider à apprendre à utiliser SEED-Platform.", "Please wait while your data is loaded...": "Veuillez patienter pendant que vos données sont chargées ...", "Populate SEED Headers with best known matches": "Remplissez les en-têtes SEED avec les correspondances les plus connues", + "Portfolio Summary": "Résumé du portefeuille", + "Portfolio Summary will only include properties belonging to this Access Level Instance.": "Le résumé du portefeuille inclura uniquement les propriétés appartenant à cette instance de niveau d'accès.", + "Portfolio Target": "Cible du portefeuille", "Postal Code": "Code postal", "Postal Code (Property)": "Code postal (propriété)", "Postal Code (Tax Lot)": "Code postal (lot d'impôt)", @@ -745,6 +798,7 @@ "Preview": "Aperçu", "Preview Loading": "Aperçu Chargement", "Previous": "Précédente", + "Primary Column": "Colonne principale", "Primary Tax Lot ID": "ID de lot d'impôt primaire", "Primary\/Secondary": "Primaire\/secondaire", "Profile Info": "Informations sur le profil", @@ -791,6 +845,7 @@ "RENAME_COLUMN_TITLE": "Renommer la Colonne", "RENAME_SYS_LEVEL_COL": "Renommer permet aux utilisateurs de modifier le nom du champ sous-jacent affiché dans Nom de colonne \/ Nom de champ. Renommer un champ signifie que ce champ sera modifié dans toutes les données de l'organisation.", "REVIEW YOUR DATA MAPPINGS": "EXAMINER VOS MAPPAGES DE DONNÉES", + "REVIEW_MATCHING_CRITERIA": "Vérifiez vos critères de correspondance sur la page Paramètres de colonne avant d'importer des données pour la première fois. Vous ne pourrez pas supprimer des champs des critères de correspondance une fois les données ajoutées à votre organisation.", "Read more here.": "Lire la suite ici.", "Really reset all passwords? This will sign you out of SEED.": "Réinitialiser tous les mots de passe? Cela vous déconnectera de SEED.", "Recent Sale Date": "Date de vente récente", @@ -802,6 +857,7 @@ "Related Properties": "Propriétés connexes", "Related Tax Lots": "Lots d'impôt connexes", "Remove": "Supprimer", + "Remove Access Level": "Supprimer le niveau d'accès", "Remove Column Mappings": "Supprimer les mappages de colonnes", "Remove From Project": "Supprimer du projet", "Remove Inventory": "Supprimer l'inventaire", @@ -903,6 +959,7 @@ "SHOWING_UNFILTERED_TAXLOTS": "Affichage {start} à {end} des {total} lots d'impôt en tout", "STEP 1: Map Your Data": "ÉTAPE 1: Mappez vos données", "STEP 2: Review Your Data Mappings": "ÉTAPE 2: Consultez vos mappages de données", + "SUB_ORG_DEPRECATION": "La fonctionnalité Sous-organisation n’est plus recommandée et sera bientôt obsolète. Visitez la page des niveaux d'accès pour définir les niveaux d'accès afin de structurer le contenu de votre organisation.", "SUGGEST_TO_VERIFY": "Veuillez vérifier les points suivants avant de continuer.", "SUGGEST_UPDATE_GEOCODE_COLS": "Mettez à jour les paramètres de colonne de géocodage dans la page des paramètres de colonne de votre organisation.", "Salesforce": "Salesforce", @@ -923,6 +980,7 @@ "Search display name": "Rechercher le nom d'affichage", "Search field name": "Rechercher le nom du champ", "Search table name": "Rechercher le nom de la table", + "Secondary (optional)": "Secondaire (facultatif)", "Security": "Sécurité", "Security Token": "Jeton d'authentification", "SeedOrg": "SeedOrg", @@ -938,6 +996,8 @@ "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.", "Select columns from the lists below to make them appear on the left or right halves of your Matching List table. Drag the rows to change the order in which they appear.": "Sélectionnez les colonnes dans les listes ci-dessous pour les faire apparaître sur les moitiés gauche ou droite de votre table de Liste des Correspondances. Faites glisser les lignes pour modifier l'ordre dans lequel elles apparaissent.", "Select one or more filter groups to load your inventory.": "Sélectionnez un ou plusieurs groupes de filtres pour charger votre inventaire.", + "Select the Level at which you want to add the new Instance": "Sélectionnez le niveau auquel vous souhaitez ajouter la nouvelle instance", + "Select the new Instance's Parent Access Level Instance": "Sélectionnez l'instance de niveau d'accès parent de la nouvelle instance", "Select the type of file(s) you would like to add to": "Sélectionnez le type de fichier (s) que vous souhaitez ajouter à", "Select which columns to include in the list:": "Sélectionnez les colonnes à inclure dans la liste:", "Selected Properties": "Propriétés Sélectionnées", @@ -980,6 +1040,8 @@ "State": "État", "State (Property)": "Etat (Propriété)", "State (Tax Lot)": "État (lot d'impôt)", + "Step 1: Add Access Levels": "Étape 1: ajouter des niveaux d'accès", + "Step 2: Upload Access Level Instances": "Étape 2: Télécharger les instances de niveau d'accès", "Sub-Org Name": "Nom de la sous-organisation", "Sub-Org name is required.": "Le nom de la sous-organisation est requis.", "Sub-Organization Name": "Nom de la sous-organisation", @@ -1002,6 +1064,7 @@ "Target >= Actual for Compliance": "Cible >= Réel pour la conformité", "Target Column": "Colonne cible", "Target Field": "Champ cible", + "Target to quantify Portfolio EUI improvement. Must be between 0 and 100.": "Cible pour quantifier l’amélioration de l’IUE du portefeuille. Doit être compris entre 0 et 100.", "Tax Lot": "Lot d'impôt", "Tax Lot Count": "Nombre de lots d'impôt", "Tax Lot Detail": "Détail du lot d'impôt", @@ -1017,6 +1080,7 @@ "Taxlot Display Field": "Champ d'affichage du lot de taxes", "Terms of Service": "Conditions d'utilisation", "Terms of Service as of %(tos.created|date:\"SHORT_DATE_FORMAT\")s": "Conditions de service à partir de% (tos.created | date: \"SHORT_DATE_FORMAT\") s", + "Tertiary (optional)": "Tertiaire (facultatif)", "Test Connection": "Tester la Connexion", "Text": "Texte", "Thank you": "Merci", @@ -1041,7 +1105,7 @@ "The password link was invalid, possibly because it has already been used. Please request a new password reset.": "Le lien de mot de passe était invalide, peut-être parce qu'il a déjà été utilisé. Veuillez demander une nouvelle réinitialisation du mot de passe.", "There is also a link to the SEED-Platform Users forum, where you can connect with other users.": "Il y a aussi un lien vers le forum SEED-Platform Users, où vous pouvez vous connecter avec d'autres utilisateurs.", "There was an error loading the page": "Une erreur s'est produite lors du chargement de la page", - "This action replaces any of your current columns with the comma-delmited columns you provided. Would you like to continue?": "Cette action remplace n'importe laquelle de vos colonnes actuelles par les colonnes délimitées par des virgules que vous avez fournies. Voulez-vous continuer?", + "This action replaces any of your current columns with the comma-delimited columns you provided. Would you like to continue?": "Cette action remplace n'importe laquelle de vos colonnes actuelles par les colonnes délimitées par des virgules que vous avez fournies. Voulez-vous continuer?", "This action updates properties within the selected cycle with data from the Audit Template account associated with this organization. Only Properties with Audit Template Building IDs corresponding to those saved in Audit Template will be updated.": "Cette action met à jour les propriétés du cycle sélectionné avec les données du compte de modèle d'audit associé à cette organisation. Seules les propriétés avec des ID de bâtiment de modèle d'audit correspondant à ceux enregistrés dans le modèle d'audit seront mises à jour.", "This cycle name is already taken.": "Ce nom de cycle est déjà pris.", "This email link is invalid.": "Cette opération est irréversible.", @@ -1106,6 +1170,8 @@ "Update Property Labels": "Mettre à jour les étiquettes de propriété", "Update Salesforce": "Mettre à jour Salesforce", "Update UBID": "Mettre à jour UBID", + "Update the data type of the column to \"Area\" in": "Assurez-vous que le type de données de la colonne est bien \"Area\" dans", + "Update the data type of the column to \"EUI\" in": "Assurez-vous que le type de données de la colonne est \"EUI\" dans", "Update with Audit Template": "Mise à jour avec Audit Template", "Update with BuildingSync": "Mettre à jour avec BuildingSync", "Update with ESPM": "Mise à jour avec ESPM", @@ -1242,6 +1308,7 @@ "ex: joe@company.com": "ex: joe@company.com", "first name": "Prénom", "for your SEED Platform user account": "pour votre compte utilisateur SEED Platform", + "goal": "Objectif", "gray": "gris", "green": "vert", "has been uploaded to": "a été téléchargé à", diff --git a/seed/static/seed/partials/access_level_instances_import_messages.html b/seed/static/seed/partials/access_level_instances_import_messages.html new file mode 100644 index 0000000000..1ec00f433a --- /dev/null +++ b/seed/static/seed/partials/access_level_instances_import_messages.html @@ -0,0 +1,11 @@ + +
+ + Access Level Instances Errors + + +
+
{$ key $} - {$ error.message $}
+
+
+ diff --git a/seed/static/seed/partials/accounts.html b/seed/static/seed/partials/accounts.html index a533bf6b01..857e088d0f 100644 --- a/seed/static/seed/partials/accounts.html +++ b/seed/static/seed/partials/accounts.html @@ -28,6 +28,7 @@

{$:: 'Organizations I Manage' | translate {$:: org.name $} + {$:: 'Access Level Tree' | translate $} {$:: 'Column Mappings' | translate $} diff --git a/seed/static/seed/partials/accounts_nav.html b/seed/static/seed/partials/accounts_nav.html index c3ceeb2641..1076d089fc 100644 --- a/seed/static/seed/partials/accounts_nav.html +++ b/seed/static/seed/partials/accounts_nav.html @@ -1,3 +1,4 @@ +Access Level Tree {$:: 'Create a user' | translate $}

id="new_user_org_select" ng-options="o as o.name for o in org_user.organizations" ng-model="user.organization" - ng-change="user.org_name = undefined" + ng-change="org_form.existing_org()" >
- + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
diff --git a/seed/static/seed/partials/analyses.html b/seed/static/seed/partials/analyses.html index 6edc5f5d73..8558186c49 100644 --- a/seed/static/seed/partials/analyses.html +++ b/seed/static/seed/partials/analyses.html @@ -33,16 +33,16 @@ {$:: analysis.name $} - + - + {$:: analysis.number_of_analysis_property_views $} {$:: analysis.service $} @@ -55,7 +55,7 @@ {$:: analysis.created_at | date : 'MM-dd-yyyy HH:mm' $} - + {$ analysis.status $} {$:: analysis.start_time | date : 'MM-dd-yyyy HH:mm' $} diff --git a/seed/static/seed/partials/analysis_card.html b/seed/static/seed/partials/analysis_card.html index 29c9fbf49c..a1d8022e4e 100644 --- a/seed/static/seed/partials/analysis_card.html +++ b/seed/static/seed/partials/analysis_card.html @@ -2,20 +2,20 @@

{$:: analysis.name $} Run #{$:: analysis.views[0] $}

- + {$ analysis.status $} - + - +
@@ -41,7 +41,7 @@

{$:: analysis.name $} Run #{$:: analysis.views[0] $} {$:: users | filter : {'user_id':analysis.user} | getAnalysisRunAuthor $} | cycle {$ cycle_name $}

- + Full Analysis
diff --git a/seed/static/seed/partials/analysis_details.html b/seed/static/seed/partials/analysis_details.html index c3ecbe0dbf..ea7c41350a 100644 --- a/seed/static/seed/partials/analysis_details.html +++ b/seed/static/seed/partials/analysis_details.html @@ -27,7 +27,7 @@ {$:: analysis.created_at | date : 'MM-dd-yyyy HH:mm' $} - + {$ analysis.status $} {$:: (messages | filter : {'analysis_property_view':null})[0]['user_message'] $} diff --git a/seed/static/seed/partials/at_scenarios.html b/seed/static/seed/partials/at_scenarios.html index 459cb806ed..d119aaf5de 100644 --- a/seed/static/seed/partials/at_scenarios.html +++ b/seed/static/seed/partials/at_scenarios.html @@ -22,7 +22,7 @@ >
- @@ -48,7 +48,7 @@
- +
MEASURES
+
+ + SUB_ORG_DEPRECATION + Access Level Tree page +
diff --git a/seed/static/seed/partials/data_upload_modal.html b/seed/static/seed/partials/data_upload_modal.html index c8826e56b1..cb87fbe8f3 100644 --- a/seed/static/seed/partials/data_upload_modal.html +++ b/seed/static/seed/partials/data_upload_modal.html @@ -17,6 +17,8 @@

PM_METER_IMPORT_RESULTSConfirm Audit Template Building Import?

Select Properties to Update

Audit Template Upload Results

+

Upload Access Level Instances

+

Successful upload!

@@ -37,11 +39,15 @@

Audit Template Upload Resu

+
+

ACCESS_LEVEL_STRUCTURE_UPLOAD_TEXT

+
+
@@ -72,6 +78,11 @@

Audit Template Upload Resu

+
+ + REVIEW_MATCHING_CRITERIA + Column Settings +

FILE_TYPES_SUPPORTED

@@ -300,7 +311,7 @@

Audit Template Upload Resu ng-if="uploader.progress_last_updated != null && uploader.progress_last_checked != null && (uploader.progress_last_checked - uploader.progress_last_updated) / 1000 > 60" class="progress_bar_copy_bottom" > - + SEED is still working. Please do not refresh or leave this page. (Last updated at {$ uploader.progress_last_checked | date:'hh:mm a' $})

@@ -321,15 +332,23 @@

Audit Template Upload Resu
  • {$:: multipleCycleUpload ? 'default_cycle' : 'Cycle' | translate $}: {$ selectedCycle.name $}
  • {$:: 'Total rows in the import file' | translate $}: {$ import_file_records|number:0 $}
  • {$:: 'New properties' | translate $}: {$ property_new|number:0 $}
    • +
  • {$:: 'New properties errors' | translate $}: {$ property_new_errors|number:0 $}
  • {$:: 'New tax lots' | translate $}: {$ tax_lot_new|number:0 $}
    • +
  • {$:: 'New tax lots errors' | translate $}: {$ tax_lot_new_errors|number:0 $}
  • {$:: 'Merged properties within import file' | translate $}: {$ property_merges_within_file|number:0 $}
    • +
  • {$:: 'Merged properties within import file errors' | translate $}: {$ property_merges_within_file_errors|number:0 $}
  • {$:: 'Merged tax lots within import file' | translate $}: {$ tax_lot_merges_within_file|number:0 $}
    • +
  • {$:: 'Merged tax lots within import file errors' | translate $}: {$ tax_lot_merges_within_file_errors|number:0 $}
  • {$:: 'Merged properties against existing records' | translate $}: {$ property_merges_against_existing|number:0 $}
    • +
  • {$:: 'Merged properties against existing records errors' | translate $}: {$ property_merges_against_existing_errors|number:0 $}
  • {$:: 'Merged tax lots against existing records' | translate $}: {$ tax_lot_merges_against_existing|number:0 $}
    • +
  • {$:: 'Merged tax lots against existing records errors' | translate $}: {$ tax_lot_merges_against_existing_errors|number:0 $}
  • {$:: 'Merged properties between existing records' | translate $}: {$ property_merges_between_existing|number:0 $}
  • {$:: 'Merged tax lots between existing records' | translate $}: {$ tax_lot_merges_between_existing|number:0 $}
  • {$:: 'Ignored property duplicates within the import file' | translate $}: {$ property_duplicates_within_file|number:0 $}
    • +
  • {$:: 'Ignored property duplicates within the import file errors' | translate $}: {$ property_duplicates_within_file_errors|number:0 $}
  • {$:: 'Ignored tax lot duplicates within the import file' | translate $}: {$ tax_lot_duplicates_within_file|number:0 $}
    • +
  • {$:: 'Ignored tax lot duplicates within the import file errors' | translate $}: {$ tax_lot_duplicates_within_file_errors|number:0 $}
  • {$:: 'Ignored duplicates of existing properties' | translate $}: {$ property_duplicates_against_existing|number:0 $}
  • {$:: 'Ignored duplicates of existing tax lots' | translate $}: {$ tax_lot_duplicates_against_existing|number:0 $}
    • @@ -368,15 +387,25 @@

    Audit Template Upload Resu
  • {$:: multipleCycleUpload ? 'default_cycle' : 'Cycle' | translate $}: {$ selectedCycle.name $}
  • {$:: 'Total rows in the import file' | translate $}: {$ import_file_records|number:0 $}
  • {$:: 'New properties' | translate $}: {$ property_new|number:0 $}
    • +
  • {$:: 'New properties errors' | translate $}: {$ property_new_errors|number:0 $}
  • {$:: 'New tax lots' | translate $}: {$ tax_lot_new|number:0 $}
    • +
  • {$:: 'New tax lots errors' | translate $}: {$ tax_lot_new_errors|number:0 $}
  • {$:: 'Merged properties within import file' | translate $}: {$ property_merges_within_file|number:0 $}
    • +
  • {$:: 'Merged properties within import file errors' | translate $}: {$ property_merges_within_file_errors|number:0 $}
  • {$:: 'Merged tax lots within import file' | translate $}: {$ tax_lot_merges_within_file|number:0 $}
    • +
  • {$:: 'Merged tax lots within import file errors' | translate $}: {$ tax_lot_merges_within_file_errors|number:0 $}
  • {$:: 'Merged properties between existing records' | translate $}: {$ property_merges_between_existing|number:0 $}
    • +
  • {$:: 'Merged properties between existing records errors' | translate $}: {$ property_merges_between_existing_errors|number:0 $}
  • {$:: 'Merged tax lots between existing records' | translate $}: {$ tax_lot_merges_between_existing|number:0 $}
    • +
  • {$:: 'Merged tax lots between existing records errors' | translate $}: {$ tax_lot_merges_between_existing_errors|number:0 $}
  • {$:: 'Ignored property duplicates within the import file' | translate $}: {$ property_duplicates_within_file|number:0 $}
    • +
  • {$:: 'Ignored property duplicates within the import file errors' | translate $}: {$ property_duplicates_within_file_errors|number:0 $}
  • {$:: 'Ignored tax lot duplicates within the import file' | translate $}: {$ tax_lot_duplicates_within_file|number:0 $}
    • +
  • {$:: 'Ignored tax lot duplicates within the import file errors' | translate $}: {$ tax_lot_duplicates_within_file_errors|number:0 $}
  • {$:: 'Ignored duplicates of existing properties' | translate $}: {$ property_duplicates_against_existing|number:0 $}
    • +
  • {$:: 'Ignored duplicates of existing properties errors' | translate $}: {$ property_duplicates_against_existing_errors|number:0 $}
  • {$:: 'Ignored duplicates of existing tax lots' | translate $}: {$ tax_lot_duplicates_against_existing|number:0 $}
    • +
  • {$:: 'Ignored duplicates of existing tax lots errors' | translate $}: {$ tax_lot_duplicates_against_existing_errors|number:0 $}

    • @@ -443,7 +472,6 @@

    Audit Template Upload Resu
    {$:: pm_meter_import_error $}
    -
    @@ -541,6 +569,40 @@

    Audit Template Upload Resu
    New Property Views: {$ at_upload_summary.success $}
    Failed to update: {$ at_upload_summary.failure $}

    + +
    +
    +
    +
    +

    AH_FILE_TYPES_SUPPORTED

    +

    MULTI_FILE_EXCEL_NOT_SUPPORTED

    +
    +
    +
    + + {$:: 'Upload a Spreadsheet' | translate $} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    There were errors and/or warnings for the file(s) uploaded.
    + +
    +
    +
    +
    + +
    +
    +
    diff --git a/seed/static/seed/partials/data_upload_modal_progress.html b/seed/static/seed/partials/data_upload_modal_progress.html index 580640b251..f1098c2854 100644 --- a/seed/static/seed/partials/data_upload_modal_progress.html +++ b/seed/static/seed/partials/data_upload_modal_progress.html @@ -1,9 +1,12 @@
    +
    -
    {$ uploader.progress | number:0 $}% {$:: 'Complete' | translate $} {$ uploader.status_message ? ': ' + uploader.status_message : '' $}
    +
    {$ uploader.progress | number:0 $}% {$:: 'Complete' | translate $} {$ uploader.status_message ? ': ' + uploader.status_message : '' $}
    +
    ACCESS_LEVEL_UPLOAD_PROGRESS_MSG
    diff --git a/seed/static/seed/partials/goal_editor_modal.html b/seed/static/seed/partials/goal_editor_modal.html new file mode 100644 index 0000000000..8d190d3868 --- /dev/null +++ b/seed/static/seed/partials/goal_editor_modal.html @@ -0,0 +1,230 @@ +
    +
    +
    +
    +
    +

    {$:: 'Goal Setup' | translate $}

    +
    +
    +
    +
    +
    +
    +
    +

    + Configure one or more portfolio Energy Use Intensity (EUI) reduction goals below. + +

    +
      +
    • Select a baseline cycle and a current cycle for comparison
      • +
    • Indicate the level in your access level tree that this goal applies to
      • +
    • Indicate which fields in your data should be used for EUI and floor area information
      • +
    • Specify a percentage EUI improvement target
      • +
    +
    +

    +
    +
    +
    + +
    +
      +
    • Goal
      • +
    • + {$ goal.name $} + + +
      • +
    +
      +
    • + {$ goal_option.name $} + +
      • +
    +
      +
    • + +
      • +
    +
    + + +
    + +
    + +
      +
    • Goal
      • +
    • + + +
      • +
    + +
      +
    • Cycle Selection
      • + +
    • + + +
      • + +
    • + + +
      • +
    • + Current Cycle will be measured against Baseline Cycle +
      • +
    + +
      +
    • Access Level Instance
      • + +
    • + + +
      • + +
    • + + +
      • + +
    • + Portfolio Summary will only include properties belonging to this Access Level Instance. +
      • +
    +
    + +
    + +
      +
    • Area Target Column
      • + +
    • + + +
      • +
    • + + {$:: 'Not seeing your column?' | translate $} + {$ 'Update the data type of the column to "Area" in' | translate $} + Column Settings + + Have your organization owner update the column's data type to "Area" + +
      • +
    + +
      +
    • EUI Target Columns
      • + +
    • + + +
      • + +
    • + + +
      • + +
    • + + +
      • +
    • + + + {$:: 'Not seeing your column?' | translate $} + {$ 'Update the data type of the column to "EUI" in' | translate $} + Column Settings + + Have your organization owner update the column's data type to "EUI" + +
      • +
    + +
      +
    • Portfolio Target
      • +
    • + + +
      • +
    • + Target to quantify Portfolio EUI improvement. Must be between 0 and 100. +
      • +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + {$ error $} +
    +
    +
    + + +
    +
    +
    diff --git a/seed/static/seed/partials/insights_nav.html b/seed/static/seed/partials/insights_nav.html index 28aaef8e68..8744207adb 100644 --- a/seed/static/seed/partials/insights_nav.html +++ b/seed/static/seed/partials/insights_nav.html @@ -1,4 +1,5 @@ -Program Overview -Property Insights -Default Reports -Custom Reports + Program OverviewProperty InsightsDefault ReportsCustom ReportsPortfolio Summary - Loading... + Loading... {$ item_derived_values[col.id] $} @@ -308,7 +325,7 @@

    {$ {$:: taxlotView.state.address_line_1 ? taxlotView.state.address_line_1 : '(no address 1)' $} -
    ✖
    +
    ✖
    @@ -331,7 +348,7 @@

    {$ {$:: propertyView.state.ubid ? propertyView.state.ubid : '(no UBID)' $} -
    ✖
    +
    ✖
    @@ -352,7 +369,7 @@

    {$:: 'Inventory Documents' | translate

    - +

    @@ -372,7 +389,7 @@

    {$:: 'Inventory Documents' | translate {$:: file.filename $} - + {$ file.file_type $} {$ file.created | date: 'yyyy-MM-dd h:mm a' $} diff --git a/seed/static/seed/partials/inventory_detail_analyses.html b/seed/static/seed/partials/inventory_detail_analyses.html index 8b9190bb2c..5ff19c1a92 100644 --- a/seed/static/seed/partials/inventory_detail_analyses.html +++ b/seed/static/seed/partials/inventory_detail_analyses.html @@ -48,6 +48,6 @@

    - +
    diff --git a/seed/static/seed/partials/inventory_detail_meters.html b/seed/static/seed/partials/inventory_detail_meters.html index 1d5dfb8af4..6265b56698 100644 --- a/seed/static/seed/partials/inventory_detail_meters.html +++ b/seed/static/seed/partials/inventory_detail_meters.html @@ -37,7 +37,7 @@

    -
    +
    diff --git a/seed/static/seed/partials/inventory_detail_sensors.html b/seed/static/seed/partials/inventory_detail_sensors.html index e7b7ae7dea..1656688364 100644 --- a/seed/static/seed/partials/inventory_detail_sensors.html +++ b/seed/static/seed/partials/inventory_detail_sensors.html @@ -30,7 +30,7 @@

    -
    +
    diff --git a/seed/static/seed/partials/inventory_detail_settings.html b/seed/static/seed/partials/inventory_detail_settings.html index b3ff83dee3..f64d370a70 100644 --- a/seed/static/seed/partials/inventory_detail_settings.html +++ b/seed/static/seed/partials/inventory_detail_settings.html @@ -28,18 +28,20 @@

    Column Order/VisibilityDetail Column List Profile: - - - - + + + + + +

    diff --git a/seed/static/seed/partials/inventory_list.html b/seed/static/seed/partials/inventory_list.html index f5869a4a9f..b39785b387 100644 --- a/seed/static/seed/partials/inventory_list.html +++ b/seed/static/seed/partials/inventory_list.html @@ -41,23 +41,24 @@

    {$:: (inventory_type === 'taxlots' ? 'Tax Lots' : 'Properties') | translate - - - - - - - - - - - + + + + + + + + + + + - - + + - + + @@ -127,7 +128,7 @@

    {$:: (inventory_type === 'taxlots' ? 'Tax Lots' : 'Properties') | translate -
    +
    diff --git a/seed/static/seed/partials/inventory_reports.html b/seed/static/seed/partials/inventory_reports.html index e140b5c2fa..038afb6309 100644 --- a/seed/static/seed/partials/inventory_reports.html +++ b/seed/static/seed/partials/inventory_reports.html @@ -39,12 +39,12 @@

    {$::
    - +
    - +
    diff --git a/seed/static/seed/partials/inventory_settings.html b/seed/static/seed/partials/inventory_settings.html index 36e3104e06..1d43663a9d 100644 --- a/seed/static/seed/partials/inventory_settings.html +++ b/seed/static/seed/partials/inventory_settings.html @@ -23,25 +23,27 @@

    Column Order/VisibilityColumn List Profile: - - - - + + + + + +

    @@ -53,7 +55,7 @@

    Add Shared Tax Lots

    Add Shared Properties

    diff --git a/seed/static/seed/partials/mapping.html b/seed/static/seed/partials/mapping.html index c51f2b7817..87e5e74dd6 100644 --- a/seed/static/seed/partials/mapping.html +++ b/seed/static/seed/partials/mapping.html @@ -155,6 +155,9 @@

    Please review SEED column names or the column names of the file being imported. Duplicate values are not allowed in either case.

    +
    + You do not have access to create columns. +
    Please review SEED column names or the column names of the file being imported. Column names that match an existing Derived Column name are not allowed.
    @@ -199,17 +202,17 @@

    - + - + - + kgCO2e/m**2/year - + {$:: col.name $} {$:: cell_value $} @@ -276,7 +279,7 @@

    + + + diff --git a/seed/static/seed/partials/new_member_modal.html b/seed/static/seed/partials/new_member_modal.html index 99f83c9d8b..0194ef4fa7 100644 --- a/seed/static/seed/partials/new_member_modal.html +++ b/seed/static/seed/partials/new_member_modal.html @@ -13,23 +13,38 @@

    - +

    Last name is required.

    - +

    Enter a valid email address.

    - + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    - +
    +
    + {$ error_message $} +
    diff --git a/seed/static/seed/partials/notes.html b/seed/static/seed/partials/notes.html index 3a8817391c..95cc477cb6 100644 --- a/seed/static/seed/partials/notes.html +++ b/seed/static/seed/partials/notes.html @@ -13,7 +13,7 @@

    - + @@ -40,12 +40,12 @@

    diff --git a/seed/static/seed/partials/organization_access_level_tree.html b/seed/static/seed/partials/organization_access_level_tree.html new file mode 100644 index 0000000000..bae403b9e2 --- /dev/null +++ b/seed/static/seed/partials/organization_access_level_tree.html @@ -0,0 +1,149 @@ +
    +
    +
    + {$:: 'Organizations' | translate $} +
    +
    +

    {$:: org.name $}

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    {$:: 'Access Level Tree' | translate $}

    +
    +
    +
    +
    +
    + +
    +

    ACCESS_LEVEL_TREE_HELP_1

    +

    Access Levels (AL)

    +

    ACCESS_LEVEL_DESCRIPTION

    +

    Access Levels Instances (ALI)

    +

    ACCESS_LEVEL_INSTANCE_DESCRIPTION

    +

    Example Access Level Tree

    + + +

    Managing the Access Level Tree

    +

    ACCESS_LEVEL_ORG_OWNER

    +
      +
    • {$:: 'Step 1: Add Access Levels' | translate $} - + ACCESS_LEVEL_OWNER_STEP1 +
      • +
    • {$:: 'Step 2: Upload Access Level Instances' | translate $} - + ACCESS_LEVEL_OWNER_STEP2 +
      • +
    +

    ACCESS_LEVEL_OWNER_END

    +
    +
    +

    Access Levels

    + +
    +
    - -
    + + + + + + +
    Level {$:: ($index + 1) $} Name
    + {$:: level $} +
    +
    + +
    +

    Access Level Instance Tree

    + + +
    +
    + {$:: 'Level' | translate $} 1: {$ access_level_names[0] $} +
    +
    +

    ACCESS_LEVEL_ROOT_TEXT

    + {$:: access_level_tree[0].data.name $} + + + + +
    +
    +
    +
    +
    +
    + + +
    +
    + + + diff --git a/seed/static/seed/partials/organization_add_access_level_instance_modal.html b/seed/static/seed/partials/organization_add_access_level_instance_modal.html new file mode 100644 index 0000000000..947a3336f9 --- /dev/null +++ b/seed/static/seed/partials/organization_add_access_level_instance_modal.html @@ -0,0 +1,38 @@ +
    +

    {$:: 'Add Level Instance (Node) to the Organizational Structure' | translate $}

    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    diff --git a/seed/static/seed/partials/organization_add_access_level_modal.html b/seed/static/seed/partials/organization_add_access_level_modal.html new file mode 100644 index 0000000000..9099f6c54c --- /dev/null +++ b/seed/static/seed/partials/organization_add_access_level_modal.html @@ -0,0 +1,31 @@ +
    +

    {$:: 'Add Levels to the Organizational Structure Tree' | translate $}

    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + + +
    +
    +
    +
    + + + + + + +
    diff --git a/seed/static/seed/partials/organization_delete_access_level_instance_modal.html b/seed/static/seed/partials/organization_delete_access_level_instance_modal.html new file mode 100644 index 0000000000..6223327b58 --- /dev/null +++ b/seed/static/seed/partials/organization_delete_access_level_instance_modal.html @@ -0,0 +1,24 @@ +
    +

    {$:: 'Delete Access Level Instance' | translate $} - {$ level_instance_name $}

    +
    + +
    +
    + Warning +

    Deleting this access level instance will delete everything else associated with it:

    +
    - {$ reason$}
    +
    +
    + +
    +
    ACCESS_LEVEL_DELETE_AREYOUSURE
    +
    +
    +
    + +
    +
    + + +
    +
    diff --git a/seed/static/seed/partials/organization_edit_access_level_instance_modal.html b/seed/static/seed/partials/organization_edit_access_level_instance_modal.html new file mode 100644 index 0000000000..ad44728407 --- /dev/null +++ b/seed/static/seed/partials/organization_edit_access_level_instance_modal.html @@ -0,0 +1,15 @@ +
    +

    {$:: 'Edit Access Level Instance Name' | translate $}

    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    diff --git a/seed/static/seed/partials/portfolio_summary.html b/seed/static/seed/partials/portfolio_summary.html new file mode 100644 index 0000000000..5378b13414 --- /dev/null +++ b/seed/static/seed/partials/portfolio_summary.html @@ -0,0 +1,89 @@ +
    +
    +
    +
    +

    Portfolio Summary

    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + {$:: 'The portfolio summary page compares 2 cycles to calculate progress toward an Energy Use Intensity reduction goal.' | translate $} + {$:: 'Cycle selection and goal details can be customized by clicking the Configure Goals button below.' | translate $} +
    +
    +
    + +
    + +
    + +
    +
    + +
    +
    +
    +
    {$ detail[0] $}:
    +
    {$ detail[1] $}
    +
    +
    +
    +
    +
    {$ detail[0] $}:
    +
    {$ detail[1] $}
    +
    +
    +
    +
    + +
    +

    Portfolio Summary

    +
    +
    +

    {$:: 'Loading Summary Data...' | translate $}

    + + + +
    +
    +
    + + +
    +
    + +
    +
    + {$ inventory_pagination.start $}-{$ inventory_pagination.end $} of {$ inventory_pagination.total $} + + ({$ selected_display $} - Select All - Select None) + + + +
    +
    + +
    +
    +
    +
    +
    +
    +

    Loading Data...

    + + + +
    +
    diff --git a/seed/static/seed/partials/ubid_admin.html b/seed/static/seed/partials/ubid_admin.html index f1ba93882d..caa7eb5c7a 100644 --- a/seed/static/seed/partials/ubid_admin.html +++ b/seed/static/seed/partials/ubid_admin.html @@ -1,7 +1,7 @@
    -
    +
    @@ -28,10 +28,10 @@
    Preferred
    - - diff --git a/seed/static/seed/partials/update_item_labels_modal.html b/seed/static/seed/partials/update_item_labels_modal.html index aab313af17..6cd5753fde 100644 --- a/seed/static/seed/partials/update_item_labels_modal.html +++ b/seed/static/seed/partials/update_item_labels_modal.html @@ -3,7 +3,7 @@
    -
    +
    diff --git a/seed/static/seed/scss/style.scss b/seed/static/seed/scss/style.scss index e4fcbb0a11..84a6b0eafe 100755 --- a/seed/static/seed/scss/style.scss +++ b/seed/static/seed/scss/style.scss @@ -1718,6 +1718,11 @@ a:not([href]) { } } + .add-btn { + margin: 15px 0; + text-align: center; + } + .form-group { p { margin: 0 0 8px; @@ -1811,6 +1816,7 @@ a:not([href]) { background-image: linear-gradient(transparent, #fff); position: fixed; bottom: 66px; + pointer-events: none; } .gradient-height { @@ -3173,7 +3179,7 @@ tags-input .tags .tag-item .remove-button { opacity: 0.5 !important; } -.ui-grid-draggable-row { +.ui-grid-draggable-row[draggable='true'] { cursor: grab; height: 30px; } @@ -3869,6 +3875,31 @@ $pairedCellWidth: 60px; padding-left: 5px; } +.pad-bot-10 { + padding-bottom: 10px; +} + +.pad-top-10 { + padding-top: 10px; +} + +.access-tree { + margin-top: 20px; +} + +.tree-header { + font-size: 1.2em !important; +} + +.levels-table { + margin: 10px 25px 0px 25px; +} + +.access-level-info-section { + margin-top: 10px; + padding-right: 5px; +} + .pad-bottom-10 { padding-bottom: 10px; } @@ -4807,13 +4838,17 @@ ul.r-list { } .accordion-header[aria-expanded='true'] i { - transform: rotate(90deg); - transition: transform 0.5s; + &:not(.fa-pencil):not(.fa-trash) { + transform: rotate(90deg); + transition: transform 0.5s; + } } .accordion-header[aria-expanded='false'] i { - transform: rotate(0deg); - transition: transform 0.5s; + &:not(.fa-pencil):not(.fa-trash) { + transform: rotate(0deg); + transition: transform 0.5s; + } } .measure-elec { @@ -4902,6 +4937,132 @@ ul.r-list { } } +#ali-detail-table { + border: 1px solid #ddd; + + th { + border: 1px solid #ddd; + } +} + +.ali-header { + background: #dbe3f4; +} + +.ali-cell { + color: #2955b4; +} + +.ali-warning { + color: #c24e00; +} + +.al-tree { + padding: 10px; +} + +#access-level-tree { + margin: 20px; + + ul { + list-style-type: none; + padding-left: 20px; + + li::before { + content: '-'; + display: inline-block; + width: 10px; + } + } + + .collapsed ul { + display: none; + } + + li.collapsed::before { + content: '+'; + display: inline-block; + width: 10px; + } + + li a:hover { + cursor: pointer; + } + + a { + font-size: 16px; + } +} + +.level0 { + padding: 6px 10px 5px; +} + +.level1 { + margin: 0 9px; + background-color: #cdcdcd; + text-transform: uppercase; + font-weight: bold; + text-shadow: 0 1px 0 white; + border-bottom: 1px solid #b3b3b3; + padding: 6px 10px 5px; + white-space: nowrap; + font-family: 'PT Sans Narrow', 'Helvetica Neue', Helvetica, Arial, sans-serif; + border: 1px solid #ddd; +} + +.badge-primary { + color: #fff; + background-color: #337ab7; + border-color: #2e6da4; +} + +.access-level-tree { + .hidden-row { + padding: 0 !important; + + &:not(:has(> .collapse.in, > .collapsing)) { + // No border if collapsed + border-bottom-width: 0 !important; + } + } +} + +.levels-header { + font-weight: bold; + padding: 0; +} + +.level-child { + &:has(> i.fa-chevron-right) { + cursor: pointer; + } + + span { + margin-bottom: -1px; + padding-left: 8px; + } +} + +.levels-table-item-detail { + margin: 0; + border: 1px solid #f1f1f1; +} + +.accordion-header .levels-button { + background-color: black; + color: white; + padding: 7px 20px; + margin: 3px 10px; + font-weight: bold; + font-size: 16px; +} + +.level-child { + vertical-align: middle; + font-weight: normal; +} + .ubid-form { input.ng-invalid { background-color: #fff0f0; @@ -4948,6 +5109,234 @@ ul.r-list { } } +.portfolio-summary-wrapper { + display: flex; + flex: 1; + flex-direction: column; + + .goals-header-text { + min-height: 30px; + padding: 10px 10px 0; + } + + .goal-actions-wrapper { + display: flex; + margin: 0 10px; + + div { + margin: 0 10px; + } + + .goal-select-wrapper { + display: flex; + min-height: 30px; + margin: 15px; + + .goal-select-label { + margin: auto; + } + + .goal-selection { + #goal-select { + width: 30vw; + max-width: 512px; + background: #f5f5f5; + border-radius: 5px; + padding: 5px; + } + } + + button { + margin-left: 10px; + height: 100%; + } + } + } + + #portfolio-summary-selection-wrapper { + padding: 20px 24px 0; + display: flex; + + #portfolio-summary-selections { + margin-top: 22px; + padding-left: 10px; + width: 220px; + + .portfolio-summary-select-option { + font-size: 10px; + padding: 4px 0 6px 0; + } + + .portfolio-summary-constant { + border: 1px solid gray; + border-radius: 2px; + background: rgb(229, 229, 229); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding-left: 4px; + } + + .starting-legend { + background-color: #f8f1cf; + } + + .ending-legend { + background-color: #f8d0c4; + } + + .portfolio-summary-form-control { + height: 20px; + width: 100px; + } + } + + #portfolio-summary { + width: 100%; + padding-bottom: 30px; + border-bottom: 1px solid rgb(199, 199, 199); + + h3 { + margin: 0; + padding-bottom: 10px; + } + } + } + + .portfolio-summary-btn { + height: 28px; + padding: 0 10px; + } + + #portfolio-summary-grid { + display: flex; + flex: 1; + padding: 0 24px; + } + + #portfolio-summary-grid, + #portfolio-summary { + .portfolio-summary-baseline-header { + background-color: #f8f1cf; + } + + .ui-grid-row:nth-child(odd) .portfolio-summary-baseline-cell { + background-color: #f8f5eb !important; + } + + .ui-grid-row:nth-child(even) .portfolio-summary-baseline-cell { + background-color: #e0ded3 !important; + } + + .portfolio-summary-current-header { + background-color: #f8d0c4; + } + + .ui-grid-row:nth-child(odd) .portfolio-summary-current-cell { + background-color: #f9eee9 !important; + } + + .ui-grid-row:nth-child(even) .portfolio-summary-current-cell { + background-color: #dfd3ce !important; + } + + .above-target { + background: #d0e6d4; + } + + .below-target { + background: #ca8f8f; + } + + #portfolioSummary-gridOptions-wrapper { + display: flex; + overflow-x: hidden; + width: 100%; + } + } + + .portfolio-summary-loading { + border: 1px solid rgb(188, 188, 188); + border-radius: 5px; + height: 100px; + padding: 0 50px; + position: relative; + background: rgba(128, 128, 128, 0.1); + color: rgb(128, 128, 128); + } + + .portfolio-summary-item-count { + height: 64px; + margin: 0 24px; + + align-items: center; + justify-content: space-between; + display: flex; + } + + .goal-details-container { + padding: 10px; + display: flex; + border: 1px solid rgb(197, 197, 197); + border-radius: 5px; + background: rgb(241, 241, 241); + width: fit-content; + margin: 0 24px; + + .goal-details-column { + .goal-detail { + display: flex; + + .goal-detail-key { + text-align: right; + width: 120px; + padding-right: 10px; + } + + .goal-detail-value { + font-weight: bold; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + width: 150px; + } + } + } + } +} + +.goals-text { + padding: 5px 100px 10px 10px; + font-size: 1.1em; +} + +#goal-details { + max-height: 70vh; + overflow: scroll; + // display: flex; + // column-gap: 10px; + + .goal-label { + width: 150px; + } + + .goal-form-control { + height: unset; + padding: 0; + } +} + +#goal-list { + max-height: 485px; +} + +#goal-messages { + margin: 10px; + padding: 10px; + border-radius: 10px; + text-align: left; +} + .analysis-results-section { padding: 5px 10px; margin: 0; @@ -4960,6 +5349,20 @@ ul.r-list { font-size: 1.3em; } +.tree-image { + width: 55%; + padding: 20px 100px; +} + +.tree-button { + margin-right: 10px; +} + +.al-label { + margin: 0; + font-size: 1.1em; +} + #map { height: 100%; overflow: hidden; @@ -5021,3 +5424,47 @@ tags-input .tags .tag-item { background: #337ab7; } } + +.goal-name { + overflow: hidden; + text-overflow: ellipsis; +} + +.tooltip-long { + word-wrap: break-word; +} + +.cell-edit { + cursor: copy; +} + +.cell-dropdown-indicator { + display: flex; + justify-content: space-between; + align-items: center; + margin-right: 3px; + + i { + color: gray; + } +} + +.deprecation-warning { + padding: 10px; + color: #c24e00; +} + +.confirm-label { + padding-left: 5px; + text-align: left; +} + +.cell-pass { + background-color: #d0e6d4; + border-top: 1px solid #d4d4d4; +} + +.cell-fail { + background-color: #fefbd1; + border-top: 1px solid #d4d4d4; +} diff --git a/seed/static/seed/tests/data_upload_modal_controller.spec.js b/seed/static/seed/tests/data_upload_modal_controller.spec.js index da1b1267f9..9909adb130 100644 --- a/seed/static/seed/tests/data_upload_modal_controller.spec.js +++ b/seed/static/seed/tests/data_upload_modal_controller.spec.js @@ -9,6 +9,8 @@ describe('controller: data_upload_modal_controller', () => { let data_upload_controller_scope; let mock_mapping_service; let mock_matching_service; + let mock_organization_service; + let mock_auth_service; let global_step = 1; let global_dataset = {}; @@ -37,7 +39,7 @@ describe('controller: data_upload_modal_controller', () => { $httpBackend = _$httpBackend_; $httpBackend.whenGET(/^\/static\/seed\/locales\/.*\.json/).respond(200, {}); }); - inject(($controller, $rootScope, $uibModal, urls, $q, uploader_service, mapping_service, matching_service) => { + inject(($controller, $rootScope, $uibModal, urls, $q, uploader_service, mapping_service, matching_service, organization_service, auth_service) => { controller = $controller; data_upload_controller_scope = $rootScope.$new(); modal_state = ''; @@ -47,6 +49,8 @@ describe('controller: data_upload_modal_controller', () => { mock_uploader_service = uploader_service; mock_mapping_service = mapping_service; mock_matching_service = matching_service; + mock_organization_service = organization_service; + mock_auth_service = auth_service; spyOn(mock_uploader_service, 'check_progress').andCallFake(() => // return $q.reject for error scenario $q.resolve({ @@ -106,6 +110,16 @@ describe('controller: data_upload_modal_controller', () => { status: 'warning', file_id: 3 })); + spyOn(mock_organization_service, 'get_organization').andCallFake(() => + // return organization + $q.resolve({ + organization: {}, + })); + spyOn(mock_auth_service, 'is_authorized').andCallFake(() => + // return auth + $q.resolve({ + auth: {}, + })); }); }); diff --git a/seed/static/seed/tests/mapping_controller.spec.js b/seed/static/seed/tests/mapping_controller.spec.js index d1a8bc31d9..9f38d736cb 100644 --- a/seed/static/seed/tests/mapping_controller.spec.js +++ b/seed/static/seed/tests/mapping_controller.spec.js @@ -251,7 +251,8 @@ describe('controller: mapping_controller', () => { status: 'success', organization: { display_decimal_places: 2, - id: 1 + id: 1, + access_level_names: [] } }; diff --git a/seed/static/seed/tests/members_controller.spec.js b/seed/static/seed/tests/members_controller.spec.js index 119f9e7bb9..d6bb386ae8 100644 --- a/seed/static/seed/tests/members_controller.spec.js +++ b/seed/static/seed/tests/members_controller.spec.js @@ -52,6 +52,17 @@ describe('controller: members_controller', () => { can_remove_member: true } }, + access_level_tree: { + access_level_names: ['my org'], + access_level_tree: [{ + id: 1, + data: { + name: 'root', + organization: 4, + path: { 'my org': 'root' } + } + }] + }, user_profile_payload: [ 'user_service', (user_service) => user_service.get_user_profile() @@ -97,7 +108,7 @@ describe('controller: members_controller', () => { // act ctrl_scope.$digest(); - ctrl_scope.update_role({ user_id: 2, role: 'viewer' }); + ctrl_scope.update_user({ user_id: 2 }, { role: 'viewer' }); // assertions expect(mock_organization_service.update_role).toHaveBeenCalledWith(2, 4, 'viewer'); diff --git a/seed/static/seed/tests/new_member_modal_controller.spec.js b/seed/static/seed/tests/new_member_modal_controller.spec.js index 151a810685..c87f4de9d5 100644 --- a/seed/static/seed/tests/new_member_modal_controller.spec.js +++ b/seed/static/seed/tests/new_member_modal_controller.spec.js @@ -4,8 +4,9 @@ */ describe('controller: new_member_modal_controller', () => { // globals set up and used in each test scenario - let mock_user_service; let controller; let - modal_state; + let mock_user_service; + let controller; + let modal_state; let ctrl_scope; beforeEach(() => { module('BE.seed'); @@ -30,14 +31,23 @@ describe('controller: new_member_modal_controller', () => { controller = controller('new_member_modal_controller', { $scope: ctrl_scope, $uibModalInstance: { - close: function () { + close: () => { modal_state = 'close'; }, - dismiss: function () { + dismiss: () => { modal_state = 'dismiss'; } }, - organization: { organization_id: 1 } + organization: { organization_id: 1 }, + access_level_tree: [{ + id: '1', + data: { + name: 'root', + organization: '1', + path: { 'my org': 'root' } + } + }], + level_names: ['my org'] }); } @@ -53,7 +63,7 @@ describe('controller: new_member_modal_controller', () => { ctrl_scope.$digest(); // assertions - expect(ctrl_scope.user.role.value).toEqual('member'); + expect(ctrl_scope.user.role).toEqual(MEMBER); }); it('should call the user service to add a new user to the org', () => { @@ -72,10 +82,8 @@ describe('controller: new_member_modal_controller', () => { first_name: 'JB', last_name: 'Smooth', email: 'jb.smooth@be.com', - role: ctrl_scope.roles[1].value, - organization: { - organization_id: 1 - } + role: MEMBER, + organization: { organization_id: 1 } }); }); }); diff --git a/seed/static/seed/tests/update_item_labels_controller.spec.js b/seed/static/seed/tests/update_item_labels_controller.spec.js index 0262f5fe93..238be0e891 100644 --- a/seed/static/seed/tests/update_item_labels_controller.spec.js +++ b/seed/static/seed/tests/update_item_labels_controller.spec.js @@ -141,6 +141,7 @@ describe('controller: update_item_labels_modal_controller', () => { label_service: mock_label_service, inventory_ids: [], inventory_type: 'properties', + is_ali_root: true, notification: mock_notification }); } diff --git a/seed/templates/seed/_header.html b/seed/templates/seed/_header.html index d5c145b25d..7f527ad17b 100644 --- a/seed/templates/seed/_header.html +++ b/seed/templates/seed/_header.html @@ -12,8 +12,12 @@
    -