Merge branch 'develop' into 4907-ps-refactors-december24

Author: kflemin

CHANGELOG.md

@@ -2385,7 +2385,7 @@ Accepted External Pull Requests: 11
 
 # SEED Version 2.0.0 (2016-06-11 to 2016-10-01)
 
-losed Issues: 21
+Closed Issues: 21
 - Fixed [#30]( https://github.com/SEED-platform/seed/issues/30 ), Multiple Data Files per Building Record
 - Fixed [#59]( https://github.com/SEED-platform/seed/issues/59 ), Column Reordering allowed in Matching Edit Columns view
 - Fixed [#66]( https://github.com/SEED-platform/seed/issues/66 ), Add Ability to handle multiple years of data

LICENSE.md

@@ -1,4 +1,4 @@
-SEED Platform™, Copyright (c) 2017, 2024 Alliance for Sustainable Energy, LLC, and other contributors.
+SEED Platform™, Copyright (c) 2017, 2025 Alliance for Sustainable Energy, LLC, and other contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted

docs/source/conf.py

@@ -73,7 +73,7 @@
 
 # General information about the project.
 project = "SEED Platform"
-copyright = "2017, 2024, Alliance for Sustainable Energy, LLC, and other contributors."
+copyright = "2017, 2025, Alliance for Sustainable Energy, LLC, and other contributors."
 author = "Alliance for Sustainable Energy, LLC, and other contributors."
 
 # The version info for the project you're documenting, acts as replacement for

seed/analysis_pipelines/bsyncr.py

@@ -135,7 +135,13 @@ def _prepare_all_properties(self, analysis_view_ids_by_property_view_id, analysi
     for analysis_property_view in analysis_property_views:
         meters = Meter.objects.annotate(readings_count=Count("meter_readings")).filter(
             property=analysis_property_view.property,
-            type__in=[Meter.ELECTRICITY_GRID, Meter.ELECTRICITY_SOLAR, Meter.ELECTRICITY_WIND, Meter.ELECTRICITY_UNKNOWN],
+            type__in=[
+                Meter.ELECTRICITY,
+                Meter.ELECTRICITY_GRID,
+                Meter.ELECTRICITY_SOLAR,
+                Meter.ELECTRICITY_WIND,
+                Meter.ELECTRICITY_UNKNOWN,
+            ],
             readings_count__gte=12,
         )
         if meters.count() == 0:

seed/analysis_pipelines/upgrade_recommendation.py

@@ -97,7 +97,7 @@ def get_value(name):
 
     # check if this is a pint, if so get value
     if isinstance(gross_floor_area, Quantity):
-        gross_floor_area = gross_floor_area.to_base_units().magnitude
+        gross_floor_area = gross_floor_area.magnitude
 
     # calc eui
     if total_eui:
@@ -119,7 +119,7 @@ def get_value(name):
     if target_gas_eui is None or target_electric_eui is None:
         return "Missing Data (ASHRAE Target Gas EUI/ASHRAE Target Electric EUI)"
     else:
-        benchmark = (float(target_gas_eui) + float(target_electric_eui)) / 0.8
+        total_target_eui = float(target_gas_eui) + float(target_electric_eui)
 
     # if young building:
     retrofit_threshold_year = config.get("year_built_threshold")
@@ -134,7 +134,7 @@ def get_value(name):
         #     has_bas = ddc_control_panel_count.order_by("ddc_control_panel_count").first().ddc_control_panel_count > 0
 
         fair_actual_to_benchmark_eui_ratio = config.get("fair_actual_to_benchmark_eui_ratio")
-        if ((eui / benchmark) > fair_actual_to_benchmark_eui_ratio) and has_bas is True:
+        if ((eui / total_target_eui) > fair_actual_to_benchmark_eui_ratio) and has_bas is True:
             return "Re-tuning"
         else:
             return "NO DER project recommended"
@@ -146,7 +146,7 @@ def get_value(name):
     # if big and actual to benchmark eui ratio is "poor"
     poor_actual_to_benchmark_eui_ratio = config.get("poor_actual_to_benchmark_eui_ratio")
     building_sqft_threshold = config.get("building_sqft_threshold")
-    if ((eui / benchmark) > poor_actual_to_benchmark_eui_ratio) and gross_floor_area > building_sqft_threshold:
+    if ((eui / total_target_eui) > poor_actual_to_benchmark_eui_ratio) and gross_floor_area > building_sqft_threshold:
         return "Deep Energy Retrofit"
 
     # for this next step, we will need condition_index

seed/landing/forms.py

@@ -5,24 +5,10 @@
 
 from django import forms
 from django.contrib.auth.forms import UserCreationForm
-from django.utils.translation import gettext_lazy as _
 
 from seed.landing.models import SEEDUser
 
 
-class LoginForm(forms.Form):
-    email = forms.EmailField(
-        label=_("Email"),
-        help_text=_("ex: joe@company.com"),
-        widget=forms.TextInput(attrs={"class": "field", "placeholder": _("Email Address")}),
-    )
-    password = forms.CharField(
-        label=_("Password"),
-        widget=forms.PasswordInput(attrs={"class": "field", "placeholder": _("Password"), "autocomplete": "off"}),
-        required=True,
-    )
-
-
 class CustomCreateUserForm(UserCreationForm):
     class Meta:
         model = SEEDUser

seed/landing/templates/two_factor/core/login.html

@@ -80,7 +80,7 @@ <h3>DOE Standard Energy Efficiency Data Platform | NREL Data Terms</h3>
     {% if wizard.steps.current == 'auth' %}
 
     <a class="forgot_password" href="{% url "landing:password_reset" %}">{% trans "Forgot password?" %}</a>
-      {% if request.session.include_acct_reg%}
+      {% if context.self_registration %}
       <div>
         <a class="create_account btn btn-secondary" href="{% url "landing:create_account" %}">{% trans "Create my Account" %}</a>
       </div>
@@ -107,13 +107,10 @@ <h3>DOE Standard Energy Efficiency Data Platform | NREL Data Terms</h3>
 
 {% block js %}
   <script>
-    const toggleTerms = function () {
+    const toggleTerms = () => {
       const terms = document.getElementById('terms-and-conditions');
       const hidden = ['', 'none'].includes(terms.style.display);
       terms.style.display = hidden ? 'block' : 'none';
     }
-    const resendToken = function () {
-      console.log('yup')
-    }
   </script>
 {% endblock %}

seed/landing/views.py

@@ -222,7 +222,8 @@ def handle_2fa_prompt(self, response, user):
             user.save()
         return HttpResponseRedirect("/app/#/profile/two_factor_profile")
 
-    def get(self, request, *args, **kwargs):
-        # add env var to session for conditional frontend display
-        request.session["include_acct_reg"] = settings.INCLUDE_ACCT_REG
-        return super().get(request, *args, **kwargs)
+    def render(self, form=None, **kwargs):
+        # Conditionally show the `Create my Account` button
+        kwargs.setdefault("context", {})["self_registration"] = settings.INCLUDE_ACCT_REG
+
+        return super().render(form, **kwargs)

seed/static/seed/partials/inventory_nav.html

@@ -4,5 +4,4 @@
 <a ng-if="inventory_type === 'properties'" id="inventory_groups" ui-sref="inventory_groups(::{inventory_type: inventory_type})" ui-sref-active="active" translate>Groups</a>
 <a id="inventory-cycles" ui-sref="inventory_cycles(::{inventory_type: inventory_type})" ui-sref-active="active" translate>Cross-Cycles</a>
 <a id="inventory-map" ui-sref="inventory_map(::{inventory_type: inventory_type})" ui-sref-active="active" translate>Map</a>
-<a id="inventory-data" ui-sref="custom_reports(::{inventory_type: inventory_type})" ui-sref-active="active" translate>Data</a>
 <a id="inventory-summary" ui-sref="inventory_summary(::{inventory_type: inventory_type})" ui-sref-active="active" translate>Summary</a>