Add a cycle indicator to the analysis modal and filter analyses for current cycle #3837

perryr16 · 2023-02-07T22:57:04Z

Any background context you want to provide?

Analyses and Cycles are linked through the AnalysisPropertyView table where there is a many-to-one relationship with Cycle. Currently, there is no indication which cycle an analysis is associated with and no filtering based on the relevant cycle.

What's this PR do?

Adds a message to the "Create Analysis Modal" informing the user that the analysis will be associated with the current cycle.
Adds cycle-specific analysis filtering to the Inventory Detail page's displayed analysis card.
Adds cycle-specific analysis filtering to the Inventory Detail Analyses (beta).
Adds a cycle selection dropdown to the Inventory Detail Analyses (beta) page.
Adds a cycle indicator to the analysis card summary.
Adds a cycle indicator to the analyses tables on the Analyses and Inventory Detail Analyses pages

How should this be manually tested?

This should be tested anywhere that an analysis may be created

Create an analysis from the Inventory List, ensure that cycle text is present and created cycle has a cycle indicator
Create an analysis from the Inventory Detail, ensure that cycle text is present and created cycle has a cycle indicator. After creating the analysis it should appear in the top right of the Inventory Detail. Changing cycles will show only the most recent analysis for the selected cycle.
Go to Analyses. Ensure there is a "Run Cycle" column in the analyses table.
Go to Property Detail Analyses (beta) page. Ensure there is a "Run Cycle" column in the analyses table. Click "New Analysis (beta)". Ensure there is informative text alerting the user to which cycle the analysis will be applied.

What are the relevant tickets?

#3775

Screenshots (if appropriate)

inventory_detail_analyses_beta_vid_change_cycle.mov

inventory_detail_vid_chagne_cycle.mov

anchapin

Great work! No comments.

perryr16 · 2023-03-31T15:31:17Z

@anchapin or @Ryoken, if either of you has time Inventory Detail Notes needs a cycle dropdown

# Conflicts: # seed/static/seed/js/controllers/inventory_detail_analyses_controller.js # seed/static/seed/js/controllers/inventory_detail_analyses_modal_controller.js

* Remove Deprecated APIs (#4049) * Remove deprecated endpoints * Update tests * Remove additional code related to API v2 * Add ubid_threshold to expected org response * Lock `google-chrome` to v114 (#4165) Lock chrome version to webdriver version * Bump word-wrap from 1.2.3 to 1.2.4 (#4154) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fix a few code-formatting issues (#4172) * run autopep to cleanup a few straggling issues * Run precommit against migrations * Cleanup unnecessary logging --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Add Open Street Map to CSP rules (#4169) * add error handling for sf edge case (#4159) add error handldling for sf edge case Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Remove ID from inventory document display name (#4125) remove id from inventory doc on inv det * Set the MEDIA_ROOT path back to original value during test (#4174) * set the mediaroot path back to where it started * naming * Optimize list analyses endpoint (#4206) * Optimize list analyses endpoint * Add outputfiles back in * Fix * Make it even faster * Move analyses endpoint (#4210) * Add new `create_property` and `update_with_espm` endpoint (#4012) * 179d create_property endpoint * precommit * adding property id, state id, and view id to create response * Partial fixes for handling bad data * Verify property exists and belongs to org * start of new serializer and controlling extra_data fields for 179d * fix property create endpoint * Formatting * fix org_id on column views * add report_format to PM download so spreadsheet can be downloaded * updating BAE and small tweak since assets are now typed * update BAE processing in reader * updating BAE to v0.1.14 * remove uneeded view * Add ESPM download for single property (via API) (#4158) * add single property download method * add viewset for downloading single espm report * fix BAE migration and update swagger schema * rename pm report single to download * update lokalise notes and pull from latest from website * initial commit with a new update with ESPM function. need to get the backend method finished * enable udpate_with_espm * add test and column mapping profile helper to load in the data * fix example file that was downloaded from espm * fix comment formats * file paths * style espm modal and fix both upload methods * put tmp files into the projects media dir * add column mapping profile param to update_with_espm * put tmp files into the projects media dir * add status to dresponse for pyseed * do not save in media_root * precommit * allow different urls for better and at during testing * return the mapping profile object when creating from file * add tests to ensure read_only fields are protected * Update models.py * Update models.py * - Removed broken `property_id` option - Fixed extra_data columns to only ones that actually apply - Changed `merge_state` from 0 to 1 - Added ValueError handling * Small fixes * Fix 179d ESPM update endpoint to run in foreground with Celery enabled (#4211) * Fixed bae object accessors * create two new methods for running save_raw and map to the foreground * fix type --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Fix display name (#4223) * Fix refresh_metadata (#4221) * Fix refresh_metadata * Rename * Bump uwsgi from 2.0.17.1 to 2.0.22 in /requirements (#4209) Bumps [uwsgi](https://github.com/unbit/uwsgi-docs) from 2.0.17.1 to 2.0.22. - [Commits](https://github.com/unbit/uwsgi-docs/commits) --- updated-dependencies: - dependency-name: uwsgi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Remove Beta label from text of analysis button (#4225) remove beta from analysis Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix Meters Without `source_id` (#4229) Fix showing meter readings for meters without `source_id` * Fix performance for fetching analyses and force user email to lowercase (#4213) * Set username to lowercase when updating user info * Removed unnecessary prefetch from analyses retrieval --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * EEEJ Analysis Functionality (#4208) * eeej analysis * precommit * precommit * add EJScreen * update eeej analysis to link to EJScreen report * adding analysis description for eeej * Fix display name * fix for analysis reruns * cleanup * fix eeej tests * cleanup * fix searching for string in a NoneType * set manual geocoding * fix geocode tests and add census to geocode summary * fix typos * geocode with lat/lng over address if available * add copyright text * small doc formatting cleanup * cleanup * oops, missed this formatting --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Show Analysis `debug_message` If Available (#4198) Show analysis debug_message if available Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Use display name in custom reports legend (#4060) * Use display name in custom reports legend * Fix docker compose * Fix Tests * Address comment * Clean --------- Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Allow analysis property view related properties to be null (#4227) * update ondelete buildingfile > event > scenarios * update relationhsip to null when a property is deleted * add warning triangle * remove checkbox to delete analyses with properties * precommit * reorder migrations * reset * remove commit from outside branch * add warning to analyses page * styles * Update migrations --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> * Add more API documentation for meter and meter readings (#4237) * add more api doc info on meter and meter reading endpoints * Improved nested documentation, added swagger support for enums, sorted meter readings --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Update inventory selection to include current inventory type only (#3862) filter selection by current invetory type and return its length Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Update default meter range selection for BETTER analysis (#3819) * Show all navs in org * reverse the default better meter selection * Allow analysis to be by range or cycle * html updates to add cycle to BETTER * revert to allow merge * select cycle for better * update docker-dev better api endpoint * modify valid meter data to accept cycle start and end dates * precommit * formatting * remove console and updat better url * merge conflicts * order * default current cycle to eui and better on select_cycle * Simplified --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Chapin <a.n.chapin@gmail.com> Co-authored-by: Ryo <kyle.schulz@devetry.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Delete BuildingFiles and Related Events on PropertyState delete (#4217) * update ondelete buildingfile > event > scenarios * precommit * delete scenario if event is deleted * cascade over nothing * Renumber migration --------- Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fixed Issues with Scenario/Measure CRUD Operations (#4240) Fixed issues with scenario/measure CRUD operations, cherry-picked from a640926 * Add a cycle indicator to the analysis modal and filter analyses for current cycle (#3837) * expose current cycle on new analysis modal * display analysis associated with cycle * refactor help text * add cycle indicator to analysis_card * syntax * refactor for clarity * add cycle_name to analysis display tables * add cycle dropdown to inventory detail analyses page * find analyses relavent to current cycle * precommit * formatting * remove debug logs * clarifying note * consistency * Fixed ui-router navigation --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Disable ability to remove matching criteria fields once inventory is added (#4222) * update ondelete buildingfile > event > scenarios * base for locked matching criteria * refactor for clarity * remove matching preview from frontend * remove matching preview from backend * translations * precommit * remove unrelated migration * revert * update tests --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add smaller EEEJ data files for testing (#4243) add smaller EEEJ data files for testing * Add Uniformat Table (#4238) * Add uniformat * Minor fixes --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix Meter Overwrites (#4250) * add test to make sure meter readings do not overwrite * Fixed major bug where inserting a single meter reading would delete any existing readings for any meter with the same start time - Added the ability for inserting bulk meter readings to update existing data - Sanitized sql inputs in `copy_readings` * Simplification * EEEJ test fix * add test to test overwrite of bulk meter import --------- Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix filter group dropdown bugs (#4249) Fix for filter group dropdown issues Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add Import Export to Audit Template (#4215) * base for at get buildings * base batch at import functional from frontend button * frontend confirm before upating with at * frontend triggers backend batch update * functional but missing real time progress updates * functional with progress progress is moving, but cant get back to frontend properties updating, progress bar only 50% functional with progress * cleanup * precommit * summary and date formatting * bad credentials guards * test for full at import and property update * precommit * sample buildingsync xml file * swagger documentation * request validation * precommit * comment cleanup * comment cleanup * improve tests and disable update until selection * translate * lokalise translations * function description * update view permissions * clarify error message logic * precommit * add name to at building summary * add at_updated_at to pstate on at import, prevent duplicate uploads * create column on at import to display and compare * include translation * update tests * precommit * precommit * remove translation * build bsync xml from pstate * multiple iterations for xml export * base for batch export to at * add audit_template_report_type to org model * test cleanup * add audit_template_report_type to org model * add at report type to org settings * update batch test * toggle at password visibility * move batch export to celery * export properties to at from inv list actions * backfill org audit_template_report_type * mock tests for export to audit template * phrasing * refactor export results * build out export results table * precommit * revert * precommit * download current lokalise files * add default display field to failed exports * incorporate audit template report type in test * request body to be a dict not list * add translations * update ondelete buildingfile > event > scenarios * remove property name from inventory and expand modal * update states to reflect at_updated * add export to at from inv det actions * precommit * merge develop * migration conflict * Renumber migrations * Small fixes * Privilege enforcement --------- Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fix EEEJ analysis errors when there are no lat/long or address (#4247) * fix eeej analysis errors * add eeej to tasks and fix for non-eager celery * Fix for dict key types changing based on ALWAYS_EAGER * fixes! * Simplification --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add envvar to specify loading test EEEJ dataset (#4254) * add envvar to specify loading test EEEJ dataset * slight mod to support strings as boolean values --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Default to excluding Address Line 1 as a matching criteria (#4256) * Default to excluding Address Line 1 for matching * [WIP] Fix some tests * update tests for address_line_1 default matching criteria removal --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Bump version (#4259) * bump versions * current change log * add remaining two PRs before release * Refactor map page for functionality and performance (#4260) * Major map/eeej/layout improvements * Added tract shading, database indices * Fix test failure --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Ross Perry <perryr16@gmail.com> Co-authored-by: ebeers-png <53191386+ebeers-png@users.noreply.github.com> Co-authored-by: Alex Chapin <a.n.chapin@gmail.com> Co-authored-by: Ryo <kyle.schulz@devetry.com>

* Remove Deprecated APIs (#4049) * Remove deprecated endpoints * Update tests * Remove additional code related to API v2 * Add ubid_threshold to expected org response * Lock `google-chrome` to v114 (#4165) Lock chrome version to webdriver version * Bump word-wrap from 1.2.3 to 1.2.4 (#4154) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fix a few code-formatting issues (#4172) * run autopep to cleanup a few straggling issues * Run precommit against migrations * Cleanup unnecessary logging --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Add Open Street Map to CSP rules (#4169) * add error handling for sf edge case (#4159) add error handldling for sf edge case Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Remove ID from inventory document display name (#4125) remove id from inventory doc on inv det * Set the MEDIA_ROOT path back to original value during test (#4174) * set the mediaroot path back to where it started * naming * Optimize list analyses endpoint (#4206) * Optimize list analyses endpoint * Add outputfiles back in * Fix * Make it even faster * Move analyses endpoint (#4210) * Add new `create_property` and `update_with_espm` endpoint (#4012) * 179d create_property endpoint * precommit * adding property id, state id, and view id to create response * Partial fixes for handling bad data * Verify property exists and belongs to org * start of new serializer and controlling extra_data fields for 179d * fix property create endpoint * Formatting * fix org_id on column views * add report_format to PM download so spreadsheet can be downloaded * updating BAE and small tweak since assets are now typed * update BAE processing in reader * updating BAE to v0.1.14 * remove uneeded view * Add ESPM download for single property (via API) (#4158) * add single property download method * add viewset for downloading single espm report * fix BAE migration and update swagger schema * rename pm report single to download * update lokalise notes and pull from latest from website * initial commit with a new update with ESPM function. need to get the backend method finished * enable udpate_with_espm * add test and column mapping profile helper to load in the data * fix example file that was downloaded from espm * fix comment formats * file paths * style espm modal and fix both upload methods * put tmp files into the projects media dir * add column mapping profile param to update_with_espm * put tmp files into the projects media dir * add status to dresponse for pyseed * do not save in media_root * precommit * allow different urls for better and at during testing * return the mapping profile object when creating from file * add tests to ensure read_only fields are protected * Update models.py * Update models.py * - Removed broken `property_id` option - Fixed extra_data columns to only ones that actually apply - Changed `merge_state` from 0 to 1 - Added ValueError handling * Small fixes * Fix 179d ESPM update endpoint to run in foreground with Celery enabled (#4211) * Fixed bae object accessors * create two new methods for running save_raw and map to the foreground * fix type --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Fix display name (#4223) * Fix refresh_metadata (#4221) * Fix refresh_metadata * Rename * Bump uwsgi from 2.0.17.1 to 2.0.22 in /requirements (#4209) Bumps [uwsgi](https://github.com/unbit/uwsgi-docs) from 2.0.17.1 to 2.0.22. - [Commits](https://github.com/unbit/uwsgi-docs/commits) --- updated-dependencies: - dependency-name: uwsgi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Remove Beta label from text of analysis button (#4225) remove beta from analysis Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix Meters Without `source_id` (#4229) Fix showing meter readings for meters without `source_id` * Fix performance for fetching analyses and force user email to lowercase (#4213) * Set username to lowercase when updating user info * Removed unnecessary prefetch from analyses retrieval --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * EEEJ Analysis Functionality (#4208) * eeej analysis * precommit * precommit * add EJScreen * update eeej analysis to link to EJScreen report * adding analysis description for eeej * Fix display name * fix for analysis reruns * cleanup * fix eeej tests * cleanup * fix searching for string in a NoneType * set manual geocoding * fix geocode tests and add census to geocode summary * fix typos * geocode with lat/lng over address if available * add copyright text * small doc formatting cleanup * cleanup * oops, missed this formatting --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Show Analysis `debug_message` If Available (#4198) Show analysis debug_message if available Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Use display name in custom reports legend (#4060) * Use display name in custom reports legend * Fix docker compose * Fix Tests * Address comment * Clean --------- Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Allow analysis property view related properties to be null (#4227) * update ondelete buildingfile > event > scenarios * update relationhsip to null when a property is deleted * add warning triangle * remove checkbox to delete analyses with properties * precommit * reorder migrations * reset * remove commit from outside branch * add warning to analyses page * styles * Update migrations --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> * Add more API documentation for meter and meter readings (#4237) * add more api doc info on meter and meter reading endpoints * Improved nested documentation, added swagger support for enums, sorted meter readings --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Update inventory selection to include current inventory type only (#3862) filter selection by current invetory type and return its length Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Update default meter range selection for BETTER analysis (#3819) * Show all navs in org * reverse the default better meter selection * Allow analysis to be by range or cycle * html updates to add cycle to BETTER * revert to allow merge * select cycle for better * update docker-dev better api endpoint * modify valid meter data to accept cycle start and end dates * precommit * formatting * remove console and updat better url * merge conflicts * order * default current cycle to eui and better on select_cycle * Simplified --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Chapin <a.n.chapin@gmail.com> Co-authored-by: Ryo <kyle.schulz@devetry.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Delete BuildingFiles and Related Events on PropertyState delete (#4217) * update ondelete buildingfile > event > scenarios * precommit * delete scenario if event is deleted * cascade over nothing * Renumber migration --------- Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fixed Issues with Scenario/Measure CRUD Operations (#4240) Fixed issues with scenario/measure CRUD operations, cherry-picked from a640926 * Add a cycle indicator to the analysis modal and filter analyses for current cycle (#3837) * expose current cycle on new analysis modal * display analysis associated with cycle * refactor help text * add cycle indicator to analysis_card * syntax * refactor for clarity * add cycle_name to analysis display tables * add cycle dropdown to inventory detail analyses page * find analyses relavent to current cycle * precommit * formatting * remove debug logs * clarifying note * consistency * Fixed ui-router navigation --------- Co-authored-by: Alex Swindler <Alex.Swindler@nrel.gov> * Disable ability to remove matching criteria fields once inventory is added (#4222) * update ondelete buildingfile > event > scenarios * base for locked matching criteria * refactor for clarity * remove matching preview from frontend * remove matching preview from backend * translations * precommit * remove unrelated migration * revert * update tests --------- Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add smaller EEEJ data files for testing (#4243) add smaller EEEJ data files for testing * Add Uniformat Table (#4238) * Add uniformat * Minor fixes --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix Meter Overwrites (#4250) * add test to make sure meter readings do not overwrite * Fixed major bug where inserting a single meter reading would delete any existing readings for any meter with the same start time - Added the ability for inserting bulk meter readings to update existing data - Sanitized sql inputs in `copy_readings` * Simplification * EEEJ test fix * add test to test overwrite of bulk meter import --------- Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Fix filter group dropdown bugs (#4249) Fix for filter group dropdown issues Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add Import Export to Audit Template (#4215) * base for at get buildings * base batch at import functional from frontend button * frontend confirm before upating with at * frontend triggers backend batch update * functional but missing real time progress updates * functional with progress progress is moving, but cant get back to frontend properties updating, progress bar only 50% functional with progress * cleanup * precommit * summary and date formatting * bad credentials guards * test for full at import and property update * precommit * sample buildingsync xml file * swagger documentation * request validation * precommit * comment cleanup * comment cleanup * improve tests and disable update until selection * translate * lokalise translations * function description * update view permissions * clarify error message logic * precommit * add name to at building summary * add at_updated_at to pstate on at import, prevent duplicate uploads * create column on at import to display and compare * include translation * update tests * precommit * precommit * remove translation * build bsync xml from pstate * multiple iterations for xml export * base for batch export to at * add audit_template_report_type to org model * test cleanup * add audit_template_report_type to org model * add at report type to org settings * update batch test * toggle at password visibility * move batch export to celery * export properties to at from inv list actions * backfill org audit_template_report_type * mock tests for export to audit template * phrasing * refactor export results * build out export results table * precommit * revert * precommit * download current lokalise files * add default display field to failed exports * incorporate audit template report type in test * request body to be a dict not list * add translations * update ondelete buildingfile > event > scenarios * remove property name from inventory and expand modal * update states to reflect at_updated * add export to at from inv det actions * precommit * merge develop * migration conflict * Renumber migrations * Small fixes * Privilege enforcement --------- Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Fix EEEJ analysis errors when there are no lat/long or address (#4247) * fix eeej analysis errors * add eeej to tasks and fix for non-eager celery * Fix for dict key types changing based on ALWAYS_EAGER * fixes! * Simplification --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> * Add envvar to specify loading test EEEJ dataset (#4254) * add envvar to specify loading test EEEJ dataset * slight mod to support strings as boolean values --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * Default to excluding Address Line 1 as a matching criteria (#4256) * Default to excluding Address Line 1 for matching * [WIP] Fix some tests * update tests for address_line_1 default matching criteria removal --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * Bump version (#4259) * bump versions * current change log * add remaining two PRs before release * Refactor map page for functionality and performance (#4260) * Major map/eeej/layout improvements * Added tract shading, database indices * Fix test failure * Release 2.20.0 (#4262) Merge main release commit into develop. * Fix the items in the 2.20.0 changelog (#4263) put the latest PRs in the right place * ArcGIS CSP rule (#4265) Add ArcGIS CSP rule * Add documentation for cleaning up conflicting column names during migration (#4264) * add more documentation around cleaning up columns * Update docs/source/migrations.rst Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Update docs/source/migrations.rst Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> --------- Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> * Update changelog for 2.20.0 (#4268) add 2 remaining items for release * Fix edge case for map label filtering (#4270) Fix ids that are used for map filtering * Update changelog (#4272) one more entry --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alex Swindler <alex.swindler@nrel.gov> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Co-authored-by: Hannah Eslinger <heslinge@nrel.gov> Co-authored-by: Ross Perry <perryr16@gmail.com> Co-authored-by: ebeers-png <53191386+ebeers-png@users.noreply.github.com> Co-authored-by: Alex Chapin <a.n.chapin@gmail.com> Co-authored-by: Ryo <kyle.schulz@devetry.com>

perryr16 added 3 commits February 7, 2023 14:21

expose current cycle on new analysis modal

20889bd

display analysis associated with cycle

b72b67f

refactor help text

4c46e45

perryr16 added the Enhancement Add this label if functionality was generally improved but not a full feature or maintentance. label Feb 7, 2023

perryr16 changed the base branch from bps-feature-develop to develop February 7, 2023 22:58

perryr16 changed the base branch from develop to bps-feature-develop February 7, 2023 22:58

perryr16 added 11 commits February 8, 2023 09:40

add cycle indicator to analysis_card

786b092

syntax

de62c71

refactor for clarity

ac7f5c4

add cycle_name to analysis display tables

6e8d869

add cycle dropdown to inventory detail analyses page

7059e00

find analyses relavent to current cycle

26961f1

precommit

f1fbe62

formatting

6fff99d

remove debug logs

520a38f

clarifying note

65c56af

consistency

bd937bf

perryr16 marked this pull request as ready for review February 9, 2023 17:11

perryr16 requested a review from anchapin February 9, 2023 17:11

anchapin approved these changes Feb 9, 2023

View reviewed changes

perryr16 requested review from nllong and axelstudios and removed request for nllong February 10, 2023 15:30

perryr16 added the DO NOT MERGE label Mar 31, 2023

perryr16 removed the DO NOT MERGE label Sep 19, 2023

axelstudios changed the base branch from bps-feature-develop to develop September 25, 2023 18:39

axelstudios added 2 commits September 25, 2023 12:50

Merge branch 'develop' into 3775-analysis-cycle-indicator

6517a3c

# Conflicts: # seed/static/seed/js/controllers/inventory_detail_analyses_controller.js # seed/static/seed/js/controllers/inventory_detail_analyses_modal_controller.js

Fixed ui-router navigation

b566676

axelstudios approved these changes Sep 25, 2023

View reviewed changes

Merge branch 'develop' into 3775-analysis-cycle-indicator

e324da8

axelstudios merged commit 20d2ab0 into develop Sep 25, 2023
7 checks passed

axelstudios deleted the 3775-analysis-cycle-indicator branch September 25, 2023 21:15

nllong mentioned this pull request Oct 6, 2023

Release 2.20.0 (again) (#4273) #4275

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a cycle indicator to the analysis modal and filter analyses for current cycle #3837

Add a cycle indicator to the analysis modal and filter analyses for current cycle #3837

perryr16 commented Feb 7, 2023 •

edited

anchapin left a comment

perryr16 commented Mar 31, 2023 •

edited

Add a cycle indicator to the analysis modal and filter analyses for current cycle #3837

Add a cycle indicator to the analysis modal and filter analyses for current cycle #3837

Conversation

perryr16 commented Feb 7, 2023 • edited

Any background context you want to provide?

What's this PR do?

How should this be manually tested?

What are the relevant tickets?

Screenshots (if appropriate)

anchapin left a comment

Choose a reason for hiding this comment

perryr16 commented Mar 31, 2023 • edited

perryr16 commented Feb 7, 2023 •

edited

perryr16 commented Mar 31, 2023 •

edited