Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Cross Cycle Tabular View for Portfolio Summary Goals #4440

Merged
merged 88 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
cca2c06
import data review frontend
perryr16 Oct 16, 2023
4b35e5a
filter for ALI properties
perryr16 Oct 16, 2023
e1e11d3
naming
perryr16 Oct 18, 2023
193cbc8
merge ah develop
perryr16 Oct 31, 2023
dc51833
data review controller
perryr16 Oct 31, 2023
71402de
starting labels functional
perryr16 Nov 2, 2023
2c14b14
displaying labels by property not property_view
perryr16 Nov 2, 2023
d04d7a8
dynamically add starting and ending labels
perryr16 Nov 3, 2023
e169dee
formatting
perryr16 Nov 3, 2023
e1eaee7
ending style
perryr16 Nov 3, 2023
7dc92c5
styles
perryr16 Nov 3, 2023
758d217
rename data review to portfolio summary
perryr16 Nov 6, 2023
ed73cd9
reorganize - functional
perryr16 Nov 7, 2023
6a333b9
pm property id sorted as number
perryr16 Nov 7, 2023
505f0b4
endpoint for summary stats
perryr16 Nov 8, 2023
44acd8e
change starting ending to baseline current
perryr16 Nov 9, 2023
a7481d2
debugging
perryr16 Nov 9, 2023
14883d0
loading for both tables
perryr16 Nov 9, 2023
0a894f5
refactor for faster load times
perryr16 Nov 9, 2023
6da4919
Merge branch 'AH/develop' into AH/CCTV-pagination-summary-endpoint
perryr16 Nov 9, 2023
cf66b23
returning 100 matching properties
perryr16 Nov 10, 2023
111b083
pagination working, sorting not
perryr16 Nov 10, 2023
59b3095
sorting working on cannonical columns
perryr16 Nov 10, 2023
5af4b64
ali as an argument for get properties
perryr16 Nov 13, 2023
e2e5153
portfolio endpoint using ali argument
perryr16 Nov 13, 2023
447145a
change site_eui for source_eui with prefered order for summary
perryr16 Nov 14, 2023
bed9b31
generic eui display
perryr16 Nov 14, 2023
d19c40f
formatting
perryr16 Nov 14, 2023
d25e6ae
Merge branch 'AH/develop' into AH/CCTV-develop
perryr16 Nov 14, 2023
fa113b4
list endpoints for goal db table
perryr16 Nov 15, 2023
2f3d0d8
goal delete tested
perryr16 Nov 15, 2023
03c7846
goal create tested
perryr16 Nov 16, 2023
7a48ac0
update endpoint and decorators for standard endpoints
perryr16 Nov 16, 2023
d9de5f2
goal crud tested
perryr16 Nov 17, 2023
92cbb80
begin development on portfolio_summary endpoint
perryr16 Nov 17, 2023
67e74b6
portfolio_summary endpoint
perryr16 Nov 17, 2023
fdd870b
reusing filter endpoint for second cycle property call
perryr16 Nov 20, 2023
5b26a84
imports
perryr16 Nov 20, 2023
47098e5
base for goal modal
perryr16 Nov 21, 2023
17daf65
update column validation
perryr16 Nov 22, 2023
e19d6ca
create endpoint from frontned
perryr16 Nov 22, 2023
1a08f7b
goal serializes level name, delete and list integrated into frontend …
perryr16 Nov 22, 2023
11b5e82
update goal via modal
perryr16 Nov 22, 2023
70c3f5f
troubleshooting org ownership
perryr16 Nov 27, 2023
3c9740a
functional goal select, needs refactoring
perryr16 Nov 27, 2023
6c13b8b
reformat goal details display
perryr16 Nov 27, 2023
6fddd74
reformat goal details display
perryr16 Nov 27, 2023
23e4c46
goal passed between parent page and child modal
perryr16 Nov 28, 2023
5e2d9dd
guard against organization mismatches
perryr16 Nov 28, 2023
2aa87bf
cleanup, using backend logic over frontend logic
perryr16 Nov 29, 2023
5a71ad9
filtering on cycle_sqft and cycle_eui
perryr16 Nov 29, 2023
ec6d1f2
on modal close
perryr16 Dec 1, 2023
f42916a
portfolio summary with extra data
perryr16 Dec 1, 2023
c759cfa
save sort and filters
perryr16 Dec 4, 2023
f841fdd
Merge branch 'AH/develop' into AH/CCTV-db-goals
perryr16 Dec 4, 2023
45604a0
display goal errors
perryr16 Dec 5, 2023
87e1ea9
allow filtering one one cycle column at a time
perryr16 Dec 7, 2023
cca5980
extra data tested
perryr16 Dec 7, 2023
c7a0210
precommit
perryr16 Dec 8, 2023
6ed9fd6
cleanup
perryr16 Dec 11, 2023
152d56d
no goals and error display
perryr16 Dec 11, 2023
a5cf9a0
Merge branch 'AH/develop' into AH/CCTV-db-goals
perryr16 Dec 12, 2023
da7b003
remove restricted level names
perryr16 Dec 12, 2023
3dbd40b
oneline
perryr16 Dec 12, 2023
afe7f56
formatting
perryr16 Dec 13, 2023
c94850a
column ids over profile and initialize columns refactor
perryr16 Dec 13, 2023
7a9d661
protect against null values in summary
perryr16 Dec 14, 2023
5bbe550
label click bug
perryr16 Dec 14, 2023
1a0c7df
dc's cannot be filtered or sorted
perryr16 Dec 14, 2023
a50ec3f
clarify naming
perryr16 Dec 14, 2023
9001443
export current page to csv
perryr16 Dec 14, 2023
fd89a45
precommit
perryr16 Dec 14, 2023
0b881b4
toast notifications on save and delete
perryr16 Jan 9, 2024
caccdd3
rename goal column to eui_column
perryr16 Jan 16, 2024
290abcb
add area column selection to goal
perryr16 Jan 17, 2024
5da5767
add units and unit conversion - still fails with extra data
perryr16 Jan 17, 2024
2f32f50
guard against none values for kbtu and area
perryr16 Jan 18, 2024
80c7b8e
Merge branch 'AH/develop' into AH/CCTV-db-goals
perryr16 Jan 18, 2024
5862b17
migration order
perryr16 Jan 18, 2024
3679a26
provide links to update column in column settings
perryr16 Jan 18, 2024
3acd09e
precommit
perryr16 Jan 18, 2024
1be399a
precommit
perryr16 Jan 18, 2024
6de0b5e
added help text and translations
kflemin Jan 23, 2024
00aa6ae
visibility issues, sorting, info text
perryr16 Jan 24, 2024
9f6951b
phrasing
perryr16 Jan 25, 2024
0088e79
units
perryr16 Jan 25, 2024
08d0e9b
precommit
perryr16 Jan 25, 2024
bd41ed8
type check
perryr16 Jan 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified locale/en_US/LC_MESSAGES/django.mo
Binary file not shown.
96 changes: 96 additions & 0 deletions locale/en_US/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ msgstr "Upload your Organizational Structure in spreadsheet form. The file shoul
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}."

Expand Down Expand Up @@ -155,6 +158,15 @@ 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 Instances Errors"
msgstr "Access Level Instances Errors"

Expand Down Expand Up @@ -327,6 +339,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."

Expand Down Expand Up @@ -387,6 +405,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"
Expand Down Expand Up @@ -652,6 +673,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"
Expand Down Expand Up @@ -791,6 +815,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"

Expand Down Expand Up @@ -824,6 +854,9 @@ msgstr "Cycle"
msgid "Cycle Name"
msgstr "Cycle Name"

msgid "Cycle Selection"
msgstr "Cycle Selection"

msgid "Cycle updated."
msgstr "Cycle updated."

Expand Down Expand Up @@ -1105,6 +1138,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"

Expand Down Expand Up @@ -1420,6 +1456,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"

Expand Down Expand Up @@ -1466,6 +1508,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"

Expand All @@ -1484,6 +1529,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, "
Expand Down Expand Up @@ -1705,6 +1756,12 @@ 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..."

Expand Down Expand Up @@ -2050,6 +2107,9 @@ msgstr "National Renewable Energy Laboratory"
msgid "New Analysis"
msgstr "New Analysis"

msgid "New Goal"
msgstr "New Goal"

msgid "New Note"
msgstr "New Note"

Expand Down Expand Up @@ -2115,6 +2175,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:"

Expand Down Expand Up @@ -2255,6 +2318,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"

Expand Down Expand Up @@ -2346,6 +2412,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"

Expand Down Expand Up @@ -2373,6 +2448,9 @@ msgstr "Preview Loading"
msgid "Previous"
msgstr "Previous"

msgid "Primary Column"
msgstr "Primary Column"

msgid "Primary Tax Lot ID"
msgstr "Primary Tax Lot ID"

Expand Down Expand Up @@ -2916,6 +2994,9 @@ msgstr "Search field name"
msgid "Search table name"
msgstr "Search table name"

msgid "Secondary (optional)"
msgstr "Secondary (optional)"

msgid "Security"
msgstr "Security"

Expand Down Expand Up @@ -3169,6 +3250,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"

Expand Down Expand Up @@ -3218,6 +3302,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"

Expand Down Expand Up @@ -3499,6 +3586,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"

Expand Down Expand Up @@ -3939,6 +4032,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"
Expand Down
Binary file modified locale/fr_CA/LC_MESSAGES/django.mo
Binary file not shown.
Loading
Loading