diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo index 5ac22d4f18..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 2cdb5c33ba..a1842105be 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -3401,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." diff --git a/locale/fr_CA/LC_MESSAGES/django.mo b/locale/fr_CA/LC_MESSAGES/django.mo index 73c349a566..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 b0f9587bb8..085ccd3808 100644 --- a/locale/fr_CA/LC_MESSAGES/django.po +++ b/locale/fr_CA/LC_MESSAGES/django.po @@ -3427,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." diff --git a/seed/analysis_pipelines/better/pipeline.py b/seed/analysis_pipelines/better/pipeline.py index 4f71adc075..d19042de02 100644 --- a/seed/analysis_pipelines/better/pipeline.py +++ b/seed/analysis_pipelines/better/pipeline.py @@ -562,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: 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/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/match.py b/seed/data_importer/match.py index ead0908dad..a273d7b82f 100644 --- a/seed/data_importer/match.py +++ b/seed/data_importer/match.py @@ -442,7 +442,7 @@ def filter_duplicate_states(unmatched_states, sub_progress_key): elif len(present_ali_ids) == 1: canonical_state = states_with_ali[0] - # More than one ali was speficied! all are of these duplicates are invalid + # More than one ali was specified! all are of these duplicates are invalid else: errors_state_ids += [s["id"] for s in states] continue diff --git a/seed/data_importer/tests/integration/test_data_import.py b/seed/data_importer/tests/integration/test_data_import.py index 1756f2888d..e0448f2824 100644 --- a/seed/data_importer/tests/integration/test_data_import.py +++ b/seed/data_importer/tests/integration/test_data_import.py @@ -530,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/test_mapping.py b/seed/data_importer/tests/test_mapping.py index 99d544691d..8a9c5535c3 100644 --- a/seed/data_importer/tests/test_mapping.py +++ b/seed/data_importer/tests/test_mapping.py @@ -261,7 +261,7 @@ def test_mapping_takes_into_account_selected_units(self): self.assertAlmostEqual(state.gross_floor_area, (100 * ureg('m**2')).to('ft**2')) -class TestMappingAcccessLevelInstance(DataMappingBaseTestCase): +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 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 0b95319d83..834043b215 100644 --- a/seed/lib/merging/merging.py +++ b/seed/lib/merging/merging.py @@ -239,8 +239,8 @@ def merge_state(merged_state, state1, state2, priorities, ignore_merge_protectio state2_present_columns ) - deafult_ali = state1.raw_access_level_instance - merged_state.raw_access_level_instance = deafult_ali if deafult_ali is not None else state2.raw_access_level_instance + 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): diff --git a/seed/lib/superperms/orgs/models.py b/seed/lib/superperms/orgs/models.py index 29778f9fbe..6c4779350b 100644 --- a/seed/lib/superperms/orgs/models.py +++ b/seed/lib/superperms/orgs/models.py @@ -463,7 +463,7 @@ def _assert_alns_are_valid(org): alns = org.access_level_names if len(set(alns)) != len(alns): # if not unique - raise ValueError("Organiation's access_level_names must be 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: 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/data_views.py b/seed/models/data_views.py index 7417d90974..4b518f544b 100644 --- a/seed/models/data_views.py +++ b/seed/models/data_views.py @@ -67,7 +67,7 @@ def evaluate(self, columns, user_ali): # 'Average': 123, # 'Count': 123, # 'Maximum': 123, - # 'Minumum': 123, + # 'Minimum': 123, # 'Sum': 123, # 'views_by_default_field: { # view.state.default_field || state.id: 123, @@ -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: 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/goals.py b/seed/serializers/goals.py index d62938611f..15c4952289 100644 --- a/seed/serializers/goals.py +++ b/seed/serializers/goals.py @@ -30,7 +30,7 @@ def validate(self, data): raise ValidationError('Cycles must be unique.') if baseline_cycle.end > current_cycle.end: - raise ValidationError('Baseline Cycle must preceed Current Cycle.') + raise ValidationError('Baseline Cycle must precede Current Cycle.') if not all([ getattr(baseline_cycle, 'organization', None) == organization, @@ -39,7 +39,7 @@ def validate(self, data): ]): raise ValidationError('Organization mismatch.') - # non Null columns must be uniuqe + # 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]): 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/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/locales/en_US.json b/seed/static/seed/locales/en_US.json index 006db17347..088e5c898a 100644 --- a/seed/static/seed/locales/en_US.json +++ b/seed/static/seed/locales/en_US.json @@ -1105,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.", diff --git a/seed/static/seed/locales/fr_CA.json b/seed/static/seed/locales/fr_CA.json index c276f0a02a..5f871b0eb0 100644 --- a/seed/static/seed/locales/fr_CA.json +++ b/seed/static/seed/locales/fr_CA.json @@ -1105,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.", diff --git a/seed/tests/test_audit_template.py b/seed/tests/test_audit_template.py index c7f1c1270c..f51e7c2d1b 100644 --- a/seed/tests/test_audit_template.py +++ b/seed/tests/test_audit_template.py @@ -279,7 +279,7 @@ def test_batch_get_building_xml_bad_data(self, mock_request): self.assertEqual(response['success'], False) self.assertEqual(response['message'], exp_message) - # missing audit tempalte building id + # missing audit template building id url = reverse('api:v3:audit_template-batch-get-building-xml') + '?organization_id=' + str(self.org.id) + '&cycle_id=' + str(self.cycle.id) content_type = 'application/json' data = json.dumps([ diff --git a/seed/tests/test_column_list_profiles_views.py b/seed/tests/test_column_list_profiles_views.py index 96b762c16b..82e270149b 100644 --- a/seed/tests/test_column_list_profiles_views.py +++ b/seed/tests/test_column_list_profiles_views.py @@ -155,7 +155,7 @@ def test_update_column_profile(self): self.assertEqual(result['data']['columns'][0]['pinned'], True) -class ColumnsListProfileViewPermisionsTests(AccessLevelBaseTestCase, DeleteModelsTestCase): +class ColumnsListProfileViewPermissionsTests(AccessLevelBaseTestCase, DeleteModelsTestCase): def setUp(self): super().setUp() diff --git a/seed/tests/test_column_views.py b/seed/tests/test_column_views.py index ffb70f9f3b..3d73ab1b1f 100644 --- a/seed/tests/test_column_views.py +++ b/seed/tests/test_column_views.py @@ -369,7 +369,7 @@ def test_rename_column_dne(self): self.assertEqual(result['message'], 'Cannot find column in org=%s with pk=-999' % self.org.id) -class ColumnsViewPermisionsTests(AccessLevelBaseTestCase, DeleteModelsTestCase): +class ColumnsViewPermissionsTests(AccessLevelBaseTestCase, DeleteModelsTestCase): def setUp(self): super().setUp() self.column = Column.objects.create(column_name='test', organization=self.org, table_name='PropertyState', is_extra_data=True) diff --git a/seed/tests/test_data_view_views.py b/seed/tests/test_data_view_views.py index 85226ce291..3d6a0be914 100644 --- a/seed/tests/test_data_view_views.py +++ b/seed/tests/test_data_view_views.py @@ -229,7 +229,7 @@ def test_data_view_create_bad_data(self): expected = 'Data Validation Error' self.assertEqual(expected, data['message']) - def test_data_view_retreive_endpoint(self): + def test_data_view_retrieve_endpoint(self): response = self.client.get( reverse('api:v3:data_views-detail', args=[self.data_view1.id]) + '?organization_id=' + str(self.org.id) ) @@ -326,7 +326,7 @@ def setUp(self): ureg.eui = ureg.eui = ureg.kilobritish_thermal_unit / ureg.ft**2 / ureg.year # generate property states that are either 'Office' or 'Retail' for filter groups - # generate property views that are attatched to a property and a property-state + # generate property views that are attached to a property and a property-state self.state10 = self.property_state_factory.get_property_state(property_name='state10', property_type='office', site_eui=10 * ureg.eui, total_ghg_emissions=100, extra_data={'extra_col': 1000}) self.state11 = self.property_state_factory.get_property_state(property_name='state11', property_type='office', site_eui=11 * ureg.eui, total_ghg_emissions=110, extra_data={'extra_col': 1100}) self.state12 = self.property_state_factory.get_property_state(property_name='state12', property_type='retail', site_eui=12 * ureg.eui, total_ghg_emissions=120, extra_data={'extra_col': 1200}) @@ -851,7 +851,7 @@ def setUp(self): ureg.eui = ureg.eui = ureg.kilobritish_thermal_unit / ureg.ft**2 / ureg.year # generate property states that are either 'Office' or 'Retail' for filter groups - # generate property views that are attatched to a property and a property-state + # generate property views that are attached to a property and a property-state self.state10 = self.property_state_factory.get_property_state(property_name='state10', property_type='office', site_eui=10 * ureg.eui, total_ghg_emissions=100, extra_data={'extra_col': 1000}) self.state11 = self.property_state_factory.get_property_state(property_name='state11', property_type='office', site_eui=11 * ureg.eui, total_ghg_emissions=110, extra_data={'extra_col': 1100}) self.state12 = self.property_state_factory.get_property_state(property_name='state12', property_type='retail', site_eui=12 * ureg.eui, total_ghg_emissions=120, extra_data={'extra_col': 1200}) @@ -1008,7 +1008,7 @@ def test_inventory_endpoint(self): self.assertEqual(sorted(exp), sorted(list(data[str(self.fg_exc.id)].values()))) -class DataViewViewSetPermisionsTests(AccessLevelBaseTestCase): +class DataViewViewSetPermissionsTests(AccessLevelBaseTestCase): def setUp(self): super().setUp() self.cycle = FakeCycleFactory(organization=self.org, user=self.root_owner_user).get_cycle(name="Cycle A", end=datetime(2022, 1, 1, tzinfo=pytz.UTC)) diff --git a/seed/tests/test_gbr_properties.py b/seed/tests/test_gbr_properties.py index 95bba4a6d3..b8c8bb1d5d 100644 --- a/seed/tests/test_gbr_properties.py +++ b/seed/tests/test_gbr_properties.py @@ -5,7 +5,7 @@ from seed.tests.util import AccessLevelBaseTestCase, DeleteModelsTestCase -class GBRPropertiesViewPermisionsTests(AccessLevelBaseTestCase, DeleteModelsTestCase): +class GBRPropertiesViewPermissionsTests(AccessLevelBaseTestCase, DeleteModelsTestCase): def setUp(self): super().setUp() self.root_property = self.property_factory.get_property(access_level_instance=self.root_level_instance) diff --git a/seed/tests/test_meter_views.py b/seed/tests/test_meter_views.py index f204eab66c..652646b0cd 100644 --- a/seed/tests/test_meter_views.py +++ b/seed/tests/test_meter_views.py @@ -244,7 +244,7 @@ def test_get_meters_list_permissions(self): def test_get_meters_delete_permissions(self): meter_url = reverse('api:v3:property-meters-detail', kwargs={'property_pk': self.property_view.id, 'pk': self.meter.id}) + "?organization_id=" + str(self.org.id) - # child user cannot delte meters in root + # child user cannot delete meters in root self.login_as_child_member() response = self.client.delete(meter_url) assert response.status_code == 404 @@ -254,7 +254,7 @@ def test_get_meters_delete_permissions(self): response = self.client.delete(meter_url) assert response.status_code == 204 - def test_create_meter_permisions(self): + def test_create_meter_permissions(self): url = reverse('api:v3:property-meters-list', kwargs={'property_pk': self.property_view.id}) + "?organization_id=" + str(self.org.id) payload = {'type': 'Electric', 'source': 'Manual Entry', 'source_id': '1234567890'} @@ -268,7 +268,7 @@ def test_create_meter_permisions(self): response = self.client.post(url, data=json.dumps(payload), content_type='application/json') assert response.status_code == 404 - def test_update_meter_permisions(self): + def test_update_meter_permissions(self): url = reverse('api:v3:property-meters-detail', kwargs={'property_pk': self.property_view.id, 'pk': self.meter.id}) + "?organization_id=" + str(self.org.id) payload = {'type': 'Electric', 'source': 'Manual Entry', 'source_id': 'boo'} diff --git a/seed/tests/test_organization_access_levels.py b/seed/tests/test_organization_access_levels.py index ef672a58dc..7866bc283b 100644 --- a/seed/tests/test_organization_access_levels.py +++ b/seed/tests/test_organization_access_levels.py @@ -126,7 +126,7 @@ def test_edit_access_level_names_duplicates(self): ) assert raw_result.status_code == 400 - def test_edit_access_level_names_column_name_colision(self): + def test_edit_access_level_names_column_name_collision(self): url = reverse_lazy('api:v3:organization-access_levels-access-level-names', args=[self.org.id]) raw_result = self.client.post( url, diff --git a/seed/tests/test_scenarios.py b/seed/tests/test_scenarios.py index bc57b6079c..e1cd204c1e 100644 --- a/seed/tests/test_scenarios.py +++ b/seed/tests/test_scenarios.py @@ -109,7 +109,7 @@ def test_delete_scenarios_with_measures(self): measures = property_state.measure_set.all() property_measures = PropertyMeasure.objects.filter(measure__in=measures) - # assign property_measures to scneario + # assign property_measures to scenario for pm in property_measures: pm.scenario_set.set([scenario]) diff --git a/seed/tests/test_tax_lot_property.py b/seed/tests/test_tax_lot_property.py index fa0e62753c..d458d0dcc4 100644 --- a/seed/tests/test_tax_lot_property.py +++ b/seed/tests/test_tax_lot_property.py @@ -160,7 +160,7 @@ def test_csv_export_with_notes(self): self.assertTrue(notes_string in data[1]) - def test_xlxs_export(self): + def test_xlsx_export(self): for i in range(50): p = self.property_view_factory.get_property_view() self.properties.append(p.id) diff --git a/seed/utils/geocode.py b/seed/utils/geocode.py index 707d0a01fd..444e81c380 100644 --- a/seed/utils/geocode.py +++ b/seed/utils/geocode.py @@ -256,7 +256,7 @@ def _address_geocoding_results(id_addresses, mapquest_api_key): response = requests.get(request_url) try: - # Catch the invalide API key error before parsing the response + # Catch the invalid API key error before parsing the response if response.status_code == 401: raise MapQuestAPIKeyError(f'Failed geocoding property states due to MapQuest error. API Key is invalid with message: {response.content}.') diff --git a/seed/utils/goals.py b/seed/utils/goals.py index 8b359fd6d8..f7c13b8d98 100644 --- a/seed/utils/goals.py +++ b/seed/utils/goals.py @@ -11,9 +11,9 @@ def get_eui_expression(goal): """ - goal.eui_columnx is designed to only accept columns of data_type=eui (columns like site_eui, or source_eui) + goal.eui_column is designed to only accept columns of data_type=eui (columns like site_eui, or source_eui) however the user may choose to use an extra_data column that has been typed on the frontend as 'eui'. - This frontend change does not effect the db, and extra_data fields are stored as JSON objects + This frontend change does not affect the db, and extra_data fields are stored as JSON objects extra_data = {Name: value} where value can be any type. This function dynamically finds the highest priority eui column and sets its type to Integer diff --git a/seed/utils/salesforce.py b/seed/utils/salesforce.py index d08333f27c..39522041cf 100644 --- a/seed/utils/salesforce.py +++ b/seed/utils/salesforce.py @@ -39,7 +39,7 @@ def test_connection(params): def check_salesforce_enabled(org_id): - """ check that salesforce process is enabled before synching + """ check that salesforce process is enabled before syncing """ enabled = False org = Organization.objects.get(pk=org_id) diff --git a/seed/utils/ubid.py b/seed/utils/ubid.py index f0df3cb230..bd725a66a8 100644 --- a/seed/utils/ubid.py +++ b/seed/utils/ubid.py @@ -165,7 +165,7 @@ def merge_ubid_models(old_state_ids, new_state_id, StateClass): def find_preferred(old_states, new_state): - # The preferred ubid will be the first prefered ubid founnd on a list of states. + # The preferred ubid will be the first preferred ubid found on a list of states. # Where new_state is priority, and old_states[0] is least priority ordered_states = list(old_states) ordered_states.insert(0, new_state) diff --git a/seed/views/v3/column_mapping_profiles.py b/seed/views/v3/column_mapping_profiles.py index ac7ab5bb06..de8917102e 100644 --- a/seed/views/v3/column_mapping_profiles.py +++ b/seed/views/v3/column_mapping_profiles.py @@ -157,7 +157,7 @@ def update(self, request, pk=None): @action(detail=True, methods=['GET']) def csv(self, request, pk=None): """Export a column list profile in a CSV format. This format is supported in the py-seed library when setting up - new mappings programatically.""" + new mappings programmatically.""" response = HttpResponse(content_type='text/csv') response['Content-Disposition'] = f'attachment; filename="column_mapping_profile_{pk}.csv"' diff --git a/seed/views/v3/gbr_properties.py b/seed/views/v3/gbr_properties.py index 845c80165e..ef55259d9f 100644 --- a/seed/views/v3/gbr_properties.py +++ b/seed/views/v3/gbr_properties.py @@ -111,7 +111,7 @@ def create(self, request, *args, **kwargs): if not (user_ali == property_ali or property_ali.is_descendant_of(user_ali)): return JsonResponse({ 'success': False, - 'message': "no accces to this access_level_instance" + 'message': "no access to this access_level_instance" }, status=status.HTTP_403_FORBIDDEN) # save property diff --git a/seed/views/v3/organizations.py b/seed/views/v3/organizations.py index c15cdce0b6..0a67353508 100644 --- a/seed/views/v3/organizations.py +++ b/seed/views/v3/organizations.py @@ -842,7 +842,9 @@ def get_data(self, property_view, x_var, y_var, matching_columns): return result - def get_raw_report_data(self, organization_id, access_level_instance, cycles, x_var, y_var, addtional_columns=[]): + def get_raw_report_data(self, organization_id, access_level_instance, cycles, x_var, y_var, additional_columns=None): + if additional_columns is None: + additional_columns = [] all_property_views = PropertyView.objects.select_related( 'property', 'state' ).filter( @@ -861,7 +863,7 @@ def get_raw_report_data(self, organization_id, access_level_instance, cycles, x_ for property_view in property_views: property_pk = property_view.property_id count_total.append(property_pk) - result = self.get_data(property_view, x_var, y_var, addtional_columns) + result = self.get_data(property_view, x_var, y_var, additional_columns) if result: result['yr_e'] = cycle.end.strftime('%Y') de_unitted_result = apply_display_unit_preferences(organization, result) diff --git a/seed/views/v3/properties.py b/seed/views/v3/properties.py index 6a7c5d147e..80bb6b7b02 100644 --- a/seed/views/v3/properties.py +++ b/seed/views/v3/properties.py @@ -1614,7 +1614,7 @@ def batch_update_with_building_sync(self, properties, org_id, cycle_id, progress blob = ContentFile(property['xml'], name=f'at_{property["audit_template_building_id"]}_{formatted_time}.xml') response = self._update_with_building_sync(blob, 1, org_id, cycle_id, property['property_view'], property['updated_at']) response = json.loads(response.content) - results['success' if response['success'] else 'faulure'] += 1 + results['success' if response['success'] else 'failure'] += 1 progress_data.step('Updating Properties...') diff --git a/seed/views/v3/property_measures.py b/seed/views/v3/property_measures.py index 7035d0bd6b..66fe1fc09d 100644 --- a/seed/views/v3/property_measures.py +++ b/seed/views/v3/property_measures.py @@ -168,7 +168,7 @@ def destroy(self, request, property_pk=None, scenario_pk=None, pk=None): try: # property_state = PropertyView.objects.get(pk=property_pk).state # Can't use property_view to find measures on historical property_states. - # When New scenarios and measures are created the pervious property_state looses its connection + # When New scenarios and measures are created the previous property_state looses its connection # to a property_view. property_measure = PropertyMeasure.objects.get(pk=pk, scenario=scenario_pk) except (PropertyMeasure.DoesNotExist, PropertyView.DoesNotExist):