From 0264539925aa3cd1f336169ca0bf6a15d5ed2052 Mon Sep 17 00:00:00 2001 From: Hannah Eslinger Date: Fri, 1 Nov 2024 15:59:15 -0600 Subject: [PATCH 01/14] Add export charts to default reports (#4869) * Add export charts to default reports * lint * update button ls layout * lint --------- Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> --- .../inventory_reports_controller.js | 12 ++++++++++++ .../seed/partials/inventory_reports.html | 18 +++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/seed/static/seed/js/controllers/inventory_reports_controller.js b/seed/static/seed/js/controllers/inventory_reports_controller.js index e6bfd4657e..0d322b260e 100644 --- a/seed/static/seed/js/controllers/inventory_reports_controller.js +++ b/seed/static/seed/js/controllers/inventory_reports_controller.js @@ -718,6 +718,18 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re }); } + $scope.downloadChart = () => { + const a = document.createElement('a'); + a.href = $scope.barChart.toBase64Image(); + a.download = 'default_report_bar.png'; + a.click(); + + const b = document.createElement('a'); + b.href = $scope.scatterChart.toBase64Image(); + b.download = 'default_report_scatter.png'; + b.click(); + }; + function updateStorage() { // Save axis and cycle selections localStorage.setItem(localStorageXAxisKey, JSON.stringify($scope.xAxisSelectedItem ?? '')); diff --git a/seed/static/seed/partials/inventory_reports.html b/seed/static/seed/partials/inventory_reports.html index f012df3334..8044d5ac2d 100644 --- a/seed/static/seed/partials/inventory_reports.html +++ b/seed/static/seed/partials/inventory_reports.html @@ -122,7 +122,6 @@

{$:: 'X Axis' | translate $}: -
@@ -134,13 +133,10 @@

CONFIGURE_XY_AXES

- -
-
- -
- +
+ +
@@ -153,6 +149,14 @@

+
+
+ + +
+
From b8ec8cb156fa3caed49a40cf7d27f57953e728d0 Mon Sep 17 00:00:00 2001 From: Hannah Eslinger Date: Mon, 4 Nov 2024 17:04:01 -0700 Subject: [PATCH 02/14] Move show populated to backend (#4866) * Move show populated to backend * Include derived columns * Update seed/static/seed/js/controllers/show_populated_columns_modal_controller.js Co-authored-by: Ross Perry * Fix for detail page --------- Co-authored-by: Ross Perry Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> --- seed/models/columns.py | 46 +++++++- .../inventory_detail_controller.js | 2 +- ...show_populated_columns_modal_controller.js | 110 ++---------------- .../seed/js/services/inventory_service.js | 20 ++++ .../show_populated_columns_modal.html | 2 +- seed/tests/test_column_list_profiles_views.py | 98 +++++++++++++++- seed/views/v3/analyses.py | 68 +---------- seed/views/v3/column_list_profiles.py | 37 ++++++ 8 files changed, 211 insertions(+), 172 deletions(-) diff --git a/seed/models/columns.py b/seed/models/columns.py index e2b10d043b..c701d10205 100644 --- a/seed/models/columns.py +++ b/seed/models/columns.py @@ -14,8 +14,8 @@ from django.apps import apps from django.core.exceptions import ValidationError -from django.db import IntegrityError, models, transaction -from django.db.models import Q +from django.db import IntegrityError, connection, models, transaction +from django.db.models import Count, Q from django.db.models.signals import pre_save from django.utils.translation import gettext_lazy as _ @@ -1665,6 +1665,48 @@ def retrieve_all_by_tuple(org_id): return result + @staticmethod + def get_num_of_nonnulls_by_column_name(state_ids, inventory_class, columns): + states = inventory_class.objects.filter(id__in=state_ids) + + # init dicts + num_of_nonnulls_by_column_name = {c.column_name: 0 for c in columns} + canonical_columns = [c.column_name for c in columns if not c.is_extra_data] + + # add non-null counts for extra_data columns + with connection.cursor() as cursor: + table_name = "seed_propertystate" if inventory_class.__name__ == "PropertyState" else "seed_taxlotstate" + non_null_extra_data_counts_query = ( + f'SELECT key, COUNT(*)\n' + f'FROM {table_name}, LATERAL JSONB_EACH_TEXT(extra_data) AS each_entry(key, value)\n' + f'WHERE id IN ({", ".join(map(str, state_ids))})\n' + f' AND value IS NOT NULL\n' + f'GROUP BY key;' + ) + cursor.execute(non_null_extra_data_counts_query) + extra_data_counts = dict(cursor.fetchall()) + num_of_nonnulls_by_column_name.update(extra_data_counts) + + # add non-null counts for derived_data columns + with connection.cursor() as cursor: + table_name = "seed_propertystate" if inventory_class.__name__ == "PropertyState" else "seed_taxlotstate" + non_null_derived_data_counts_query = ( + f'SELECT key, COUNT(*)\n' + f'FROM {table_name}, LATERAL JSONB_EACH_TEXT(derived_data) AS each_entry(key, value)\n' + f'WHERE id IN ({", ".join(map(str, state_ids))})\n' + f' AND value IS NOT NULL\n' + f'GROUP BY key;' + ) + cursor.execute(non_null_derived_data_counts_query) + derived_data_counts = dict(cursor.fetchall()) + num_of_nonnulls_by_column_name.update(derived_data_counts) + + # add non-null counts for canonical columns + canonical_counts = states.aggregate(**{col: Count(col) for col in canonical_columns}) + num_of_nonnulls_by_column_name.update(canonical_counts) + + return num_of_nonnulls_by_column_name + def validate_model(sender, **kwargs): instance = kwargs["instance"] diff --git a/seed/static/seed/js/controllers/inventory_detail_controller.js b/seed/static/seed/js/controllers/inventory_detail_controller.js index 3ca350b575..4dd9ad85d1 100644 --- a/seed/static/seed/js/controllers/inventory_detail_controller.js +++ b/seed/static/seed/js/controllers/inventory_detail_controller.js @@ -259,7 +259,7 @@ angular.module('SEED.controller.inventory_detail', []).controller('inventory_det resolve: { columns: () => columns, currentProfile: () => $scope.currentProfile, - cycle: () => null, + cycle: () => $scope.cycle, inventory_type: () => $stateParams.inventory_type, provided_inventory() { const provided_inventory = []; diff --git a/seed/static/seed/js/controllers/show_populated_columns_modal_controller.js b/seed/static/seed/js/controllers/show_populated_columns_modal_controller.js index aa5bd47e86..54e980a262 100644 --- a/seed/static/seed/js/controllers/show_populated_columns_modal_controller.js +++ b/seed/static/seed/js/controllers/show_populated_columns_modal_controller.js @@ -17,118 +17,22 @@ angular.module('SEED.controller.show_populated_columns_modal', []).controller('s 'inventory_type', // eslint-disable-next-line func-names function ($scope, $window, $uibModalInstance, Notification, inventory_service, modified_service, spinner_utility, columns, currentProfile, cycle, provided_inventory, inventory_type) { - $scope.columns = columns; - $scope.currentProfile = currentProfile; - $scope.cycle = cycle; - $scope.inventory_type = inventory_type; - - _.forEach($scope.columns, (col) => { - col.pinnedLeft = false; - col.visible = true; - }); - - const notEmpty = (value) => !_.isNil(value) && value !== ''; - - const fetch = (page, chunk) => { - let fn; - if ($scope.inventory_type === 'properties') { - fn = inventory_service.get_properties; - } else if ($scope.inventory_type === 'taxlots') { - fn = inventory_service.get_taxlots; - } - return fn(page, chunk, $scope.cycle, -1).then((data) => { - $scope.progress = Math.round((data.pagination.end / data.pagination.total) * 100); - if (data.pagination.has_next) { - return fetch(page + 1, chunk).then((data2) => data.results.concat(data2)); - } - return data.results; - }); - }; - - const update_profile_with_populated_columns = (inventory) => { - $scope.status = `Processing ${$scope.columns.length} columns in ${inventory.length} records`; - - const cols = _.reject($scope.columns, 'related'); - // console.log('cols', cols); - - const relatedCols = _.filter($scope.columns, 'related'); - // console.log('relatedCols', relatedCols); - - const col_key = provided_inventory ? 'column_name' : 'name'; - - _.forEach(inventory, (record, index) => { - // console.log(cols.length + ' remaining cols to check'); - _.forEachRight(cols, (col, colIndex) => { - if (notEmpty(record[col[col_key]])) { - // console.log('Removing ' + col[col_key] + ' from cols'); - cols.splice(colIndex, 1); - } - }); - - _.forEach(record.related, (relatedRecord) => { - // console.log(relatedCols.length + ' remaining related cols to check'); - _.forEachRight(relatedCols, (col, colIndex) => { - if (notEmpty(relatedRecord[col[col_key]])) { - // console.log('Removing ' + col[col_key] + ' from relatedCols'); - relatedCols.splice(colIndex, 1); - } - }); - }); - - $scope.progress = (index / inventory.length) * 50 + 50; - }); - - // determine hidden columns - const visible = _.reject($scope.columns, (col) => { - if (!col.related) { - return _.find(cols, { id: col.id }); - } - return _.find(relatedCols, { id: col.id }); - }); - - const hidden = _.reject($scope.columns, (col) => _.find(visible, { id: col.id })); - - _.forEach(hidden, (col) => { - col.visible = false; - }); - - const columns = []; - _.forEach(visible, (col) => { - columns.push({ - column_name: col.column_name, - id: col.id, - order: columns.length + 1, - pinned: col.pinnedLeft, - table_name: col.table_name - }); - }); + $scope.start = () => { + $scope.state = 'running'; + $scope.status = 'Processing...'; + $scope.inventory_type = inventory_type === 'properties' ? 'Property' : 'Tax lot'; - const { id } = $scope.currentProfile; - const profile = _.omit($scope.currentProfile, 'id'); - profile.columns = columns; - inventory_service.update_column_list_profile(id, profile).then((/* updatedProfile */) => { + inventory_service.update_column_list_profile_to_show_populated(currentProfile.id, cycle.id, $scope.inventory_type).then((/* updatedProfile */) => { modified_service.resetModified(); $scope.progress = 100; $scope.state = 'done'; - $scope.status = `Found ${visible.length} populated columns`; + $scope.refresh(); }); }; - $scope.start = () => { - $scope.state = 'running'; - $scope.status = 'Fetching Inventory'; - - if (provided_inventory) { - update_profile_with_populated_columns(provided_inventory); - } else { - const page = 1; - const chunk = 5000; - fetch(page, chunk).then(update_profile_with_populated_columns); - } - }; - $scope.refresh = () => { spinner_utility.show(); + $uibModalInstance.close(); $window.location.reload(); }; diff --git a/seed/static/seed/js/services/inventory_service.js b/seed/static/seed/js/services/inventory_service.js index a7d4905091..8e48e89b83 100644 --- a/seed/static/seed/js/services/inventory_service.js +++ b/seed/static/seed/js/services/inventory_service.js @@ -1200,6 +1200,26 @@ angular.module('SEED.service.inventory', []).factory('inventory_service', [ .then((response) => response.data.data); }; + inventory_service.update_column_list_profile_to_show_populated = (id, cycle_id, inventory_type) => { + if (id === null) { + Notification.error('This settings profile is protected from modifications'); + return $q.reject(); + } + return $http + .put( + `/api/v3/column_list_profiles/${id}/show_populated/`, + { + cycle_id, + inventory_type + }, + { + params: { + organization_id: user_service.get_organization().id + } + } + ).then((response) => response.data.data); + }; + inventory_service.remove_column_list_profile = (id) => { if (id === null) { Notification.error('This settings profile is protected from modifications'); diff --git a/seed/static/seed/partials/show_populated_columns_modal.html b/seed/static/seed/partials/show_populated_columns_modal.html index 7a0a2b44c9..edc415f29d 100644 --- a/seed/static/seed/partials/show_populated_columns_modal.html +++ b/seed/static/seed/partials/show_populated_columns_modal.html @@ -4,7 +4,7 @@

Processing records...

-
This will reset your visible columns and column order to only non-derived columns that contain data. Are you sure you want to continue?
+
This will reset your visible columns and column order to only columns that contain data. Are you sure you want to continue?
{$ status $}
diff --git a/seed/tests/test_column_list_profiles_views.py b/seed/tests/test_column_list_profiles_views.py index e4843f948d..5939ec29e3 100644 --- a/seed/tests/test_column_list_profiles_views.py +++ b/seed/tests/test_column_list_profiles_views.py @@ -9,9 +9,16 @@ from rest_framework import status from seed.landing.models import SEEDUser as User -from seed.models import Column +from seed.models import VIEW_LIST_TAXLOT, Column from seed.models.derived_columns import DerivedColumn -from seed.test_helpers.fake import FakeColumnListProfileFactory +from seed.test_helpers.fake import ( + FakeColumnListProfileFactory, + FakeCycleFactory, + FakePropertyStateFactory, + FakePropertyViewFactory, + FakeTaxLotStateFactory, + FakeTaxLotViewFactory, +) from seed.tests.util import AccessLevelBaseTestCase, DeleteModelsTestCase from seed.utils.organizations import create_organization @@ -26,6 +33,15 @@ def setUp(self): self.user = User.objects.create_superuser(**user_details) self.org, _, _ = create_organization(self.user, "test-organization-a") + self.cycle_factory = FakeCycleFactory(organization=self.org, user=self.user) + self.cycle = self.cycle_factory.get_cycle() + + self.column_list_factory = FakeColumnListProfileFactory(organization=self.org) + self.property_view_factory = FakePropertyViewFactory(organization=self.org, cycle=self.cycle) + self.property_state_factory = FakePropertyStateFactory(organization=self.org) + self.taxlot_view_factory = FakeTaxLotViewFactory(organization=self.org, cycle=self.cycle) + self.taxlot_state_factory = FakeTaxLotStateFactory(organization=self.org) + self.column_1 = Column.objects.get(organization=self.org, table_name="PropertyState", column_name="address_line_1") self.column_2 = Column.objects.get(organization=self.org, table_name="PropertyState", column_name="city") self.column_3 = Column.objects.create( @@ -193,6 +209,84 @@ def test_update_column_profile(self): self.assertEqual(result["data"]["columns"][0]["order"], 999) self.assertEqual(result["data"]["columns"][0]["pinned"], True) + def test_column_profile_show_populated(self): + # Set Up + columnlistprofile = self.column_list_factory.get_columnlistprofile(columns=["address_line_1", "city"]) + state = self.property_state_factory.get_property_state(no_default_data=True, city="Denver") + self.property_view_factory.get_property_view(state=state) + + # Action + response = self.client.put( + reverse("api:v3:column_list_profiles-show-populated", args=[columnlistprofile.id]) + f"?organization_id={self.org.id}", + data=json.dumps({"cycle_id": self.cycle.id, "inventory_type": "Property"}), + content_type="application/json", + ) + result = json.loads(response.content) + + # Assertion + self.assertEqual(response.status_code, status.HTTP_200_OK) + columns = {c["column_name"] for c in result["data"]["columns"]} + self.assertSetEqual(columns, {"city", "updated", "created"}) + + def test_column_profile_show_populated_taxlots(self): + columnlistprofile = self.column_list_factory.get_columnlistprofile( + columns=["address_line_1", "city"], inventory_type=VIEW_LIST_TAXLOT + ) + state = self.taxlot_state_factory.get_taxlot_state(no_default_data=True, longitude=12345) + self.taxlot_view_factory.get_taxlot_view(state=state) + + response = self.client.put( + reverse("api:v3:column_list_profiles-show-populated", args=[columnlistprofile.id]) + f"?organization_id={self.org.id}", + data=json.dumps({"cycle_id": self.cycle.id, "inventory_type": "Tax Lot"}), + content_type="application/json", + ) + result = json.loads(response.content) + + self.assertEqual(response.status_code, status.HTTP_200_OK) + columns = {c["column_name"] for c in result["data"]["columns"]} + self.assertSetEqual(columns, {"updated", "longitude", "created"}) + + def test_column_profile_show_populated_extra_data(self): + # Set Up + columnlistprofile = self.column_list_factory.get_columnlistprofile(columns=["address_line_1", "city"]) + state = self.property_state_factory.get_property_state(no_default_data=True, extra_data={self.column_3.column_name: "Denver"}) + self.property_view_factory.get_property_view(state=state) + + # Action + response = self.client.put( + reverse("api:v3:column_list_profiles-show-populated", args=[columnlistprofile.id]) + f"?organization_id={self.org.id}", + data=json.dumps({"cycle_id": self.cycle.id, "inventory_type": "Property"}), + content_type="application/json", + ) + result = json.loads(response.content) + + # Assertion + self.assertEqual(response.status_code, status.HTTP_200_OK) + columns = {c["column_name"] for c in result["data"]["columns"]} + self.assertSetEqual(columns, {self.column_3.column_name, "updated", "created"}) + + def test_column_profile_show_populated_derived_data(self): + # Set Up + self.derived_column = DerivedColumn.objects.create(name="dc", expression="$a + 10", organization=self.org, inventory_type=0) + columnlistprofile = self.column_list_factory.get_columnlistprofile(columns=["address_line_1", "city"]) + state = self.property_state_factory.get_property_state( + no_default_data=True, derived_data={self.derived_column.column.column_name: "20"} + ) + self.property_view_factory.get_property_view(state=state) + + # Action + response = self.client.put( + reverse("api:v3:column_list_profiles-show-populated", args=[columnlistprofile.id]) + f"?organization_id={self.org.id}", + data=json.dumps({"cycle_id": self.cycle.id, "inventory_type": "Property"}), + content_type="application/json", + ) + result = json.loads(response.content) + + # Assertion + self.assertEqual(response.status_code, status.HTTP_200_OK) + columns = {c["column_name"] for c in result["data"]["columns"]} + self.assertSetEqual(columns, {self.derived_column.column.column_name, "updated", "created"}) + class ColumnsListProfileViewPermissionsTests(AccessLevelBaseTestCase, DeleteModelsTestCase): def setUp(self): diff --git a/seed/views/v3/analyses.py b/seed/views/v3/analyses.py index 195640623b..517cbfa209 100644 --- a/seed/views/v3/analyses.py +++ b/seed/views/v3/analyses.py @@ -6,8 +6,7 @@ import json import logging -from django.db import connection -from django.db.models import Count, F +from django.db.models import F from django.http import JsonResponse from drf_yasg.utils import swagger_auto_schema from rest_framework import serializers, status, viewsets @@ -315,33 +314,14 @@ def stats(self, request): property__access_level_instance__lft__gte=access_level_instance.lft, property__access_level_instance__rgt__lte=access_level_instance.rgt, ).values_list("state_id", flat=True) - states = PropertyState.objects.filter(id__in=state_ids) columns = ( Column.objects.filter(organization_id=org_id, derived_column=None, table_name="PropertyState") .exclude(column_name__in=EXCLUDED_API_FIELDS) .only("is_extra_data", "column_name") ) - num_of_nonnulls_by_column_name = {c.column_name: 0 for c in columns} - canonical_columns = [c.column_name for c in columns if not c.is_extra_data] extra_data_columns = [c.column_name for c in columns if c.is_extra_data] - - # add non-null counts for extra_data columns - with connection.cursor() as cursor: - non_null_extra_data_counts_query = ( - f'SELECT key, COUNT(*)\n' - f'FROM seed_propertystate, LATERAL JSONB_EACH_TEXT(extra_data) AS each_entry(key, value)\n' - f'WHERE id IN ({", ".join(map(str, state_ids))})\n' - f' AND value IS NOT NULL\n' - f'GROUP BY key;' - ) - cursor.execute(non_null_extra_data_counts_query) - extra_data_counts = dict(cursor.fetchall()) - num_of_nonnulls_by_column_name.update(extra_data_counts) - - # add non-null counts for canonical columns - canonical_counts = states.aggregate(**{col: Count(col) for col in canonical_columns}) - num_of_nonnulls_by_column_name.update(canonical_counts) + num_of_nonnulls_by_column_name = Column.get_num_of_nonnulls_by_column_name(state_ids, PropertyState, columns) return JsonResponse( { @@ -376,30 +356,11 @@ def used_columns(self, request): ).values_list("state_id", flat=True) if state_ids: - states = PropertyState.objects.filter(id__in=state_ids) - columns = Column.objects.filter(organization_id=org_id, derived_column=None, table_name="PropertyState").exclude( column_name__in=EXCLUDED_API_FIELDS ) - num_of_nonnulls_by_column_name = {c.column_name: 0 for c in columns} - canonical_columns = [c.column_name for c in columns if not c.is_extra_data] - - # add non-null counts for extra_data columns - with connection.cursor() as cursor: - non_null_extra_data_counts_query = ( - f'SELECT key, COUNT(*)\n' - f'FROM seed_propertystate, LATERAL JSONB_EACH_TEXT(extra_data) AS each_entry(key, value)\n' - f'WHERE id IN ({", ".join(map(str, state_ids))})\n' - f' AND value IS NOT NULL\n' - f'GROUP BY key;' - ) - cursor.execute(non_null_extra_data_counts_query) - extra_data_counts = dict(cursor.fetchall()) - num_of_nonnulls_by_column_name.update(extra_data_counts) - - # add non-null counts for canonical columns - canonical_counts = states.aggregate(**{col: Count(col) for col in canonical_columns}) - num_of_nonnulls_by_column_name.update(canonical_counts) + + num_of_nonnulls_by_column_name = Column.get_num_of_nonnulls_by_column_name(state_ids, PropertyState, columns) # Taxlots tstate_ids = TaxLotView.objects.filter( @@ -410,29 +371,10 @@ def used_columns(self, request): # add non-null counts for extra_data columns if tstate_ids: - tstates = TaxLotState.objects.filter(id__in=tstate_ids) - tcolumns = Column.objects.filter(organization_id=org_id, derived_column=None, table_name="TaxLotState").exclude( column_name__in=EXCLUDED_API_FIELDS ) - tnum_of_nonnulls_by_column_name = {c.column_name: 0 for c in tcolumns} - tcanonical_columns = [c.column_name for c in tcolumns if not c.is_extra_data] - - with connection.cursor() as cursor: - tnon_null_extra_data_counts_query = ( - f'SELECT key, COUNT(*)\n' - f'FROM seed_taxlotstate, LATERAL JSONB_EACH_TEXT(extra_data) AS each_entry(key, value)\n' - f'WHERE id IN ({", ".join(map(str, tstate_ids))})\n' - f' AND value IS NOT NULL\n' - f'GROUP BY key;' - ) - cursor.execute(tnon_null_extra_data_counts_query) - extra_data_counts = dict(cursor.fetchall()) - tnum_of_nonnulls_by_column_name.update(extra_data_counts) - - # add non-null counts for canonical columns - tcanonical_counts = tstates.aggregate(**{col: Count(col) for col in tcanonical_columns}) - tnum_of_nonnulls_by_column_name.update(tcanonical_counts) + num_of_nonnulls_by_column_name = Column.get_num_of_nonnulls_by_column_name(state_ids, TaxLotState, columns) # properties and taxlots together num_of_nonnulls_by_column_name.update(tnum_of_nonnulls_by_column_name) diff --git a/seed/views/v3/column_list_profiles.py b/seed/views/v3/column_list_profiles.py index 0d40c50426..385c5c8095 100644 --- a/seed/views/v3/column_list_profiles.py +++ b/seed/views/v3/column_list_profiles.py @@ -9,6 +9,7 @@ from django.utils.decorators import method_decorator from drf_yasg.utils import swagger_auto_schema from rest_framework import status +from rest_framework.decorators import action from rest_framework.response import Response from seed.filters import ColumnListProfileFilterBackend @@ -21,7 +22,12 @@ Column, ColumnListProfile, Organization, + PropertyState, + PropertyView, + TaxLotState, + TaxLotView, ) +from seed.models.columns import EXCLUDED_API_FIELDS from seed.serializers.column_list_profiles import ColumnListProfileSerializer from seed.utils.api import OrgValidateMixin from seed.utils.api_schema import AutoSchemaHelper, swagger_auto_schema_org_query_param @@ -183,3 +189,34 @@ def list_comstock_columns(org_id): ) return results + + @has_perm_class("requires_root_member") + @action(detail=True, methods=["PUT"]) + def show_populated(self, request, pk): + column_list_profile = ColumnListProfile.objects.get(pk=pk) + org_id = self.get_organization(self.request) + cycle_id = request.data.get("cycle_id") + inventory_type = request.data.get("inventory_type") + StateTable = PropertyState if inventory_type == "Property" else TaxLotState + ViewTable = PropertyView if inventory_type == "Property" else TaxLotView + + # get all the columns and states we need to query + all_columns = ( + Column.objects.filter(organization_id=org_id, derived_column=None, table_name=StateTable.__name__) + .exclude(column_name__in=EXCLUDED_API_FIELDS) + .only("is_extra_data", "column_name") + ) + state_ids = ViewTable.objects.filter( + cycle_id=cycle_id, + ).values_list("state_id", flat=True) + + # filter for only the populated columns + num_of_nonnulls_by_column_name = Column.get_num_of_nonnulls_by_column_name(state_ids, StateTable, all_columns) + needed_column_names = [col for col, count in num_of_nonnulls_by_column_name.items() if count > 0] + needed_columns = Column.objects.filter(column_name__in=needed_column_names, table_name=StateTable.__name__, organization=org_id) + + # set needed columns in there + column_list_profile.columns.set(needed_columns) + column_list_profile.save() + + return JsonResponse({"status": "success", "data": self.get_serializer(column_list_profile).data}, status=status.HTTP_200_OK) From 3115750b5baae08f951e7d58af3c9f81c7d8e884 Mon Sep 17 00:00:00 2001 From: Hannah Eslinger Date: Mon, 4 Nov 2024 23:09:52 -0700 Subject: [PATCH 03/14] Fix: Use old cycles during unmerge (#4452) * Fix: Use old cycles during unmerge * Fix * Fix * Add note about unmerge * Add in Taxlots * fix display of unmerged note * update translations --------- Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com> --- locale/en_US/LC_MESSAGES/django.mo | Bin 148414 -> 148503 bytes locale/en_US/LC_MESSAGES/django.po | 8 +++++- locale/es/LC_MESSAGES/django.mo | Bin 9421 -> 9565 bytes locale/es/LC_MESSAGES/django.po | 10 ++++++-- locale/fr_CA/LC_MESSAGES/django.mo | Bin 163035 -> 162864 bytes locale/fr_CA/LC_MESSAGES/django.po | 9 ++++++- seed/static/seed/locales/en_US.json | 4 ++- seed/static/seed/locales/es.json | 4 ++- seed/static/seed/locales/fr_CA.json | 4 ++- seed/static/seed/partials/notes.html | 3 ++- seed/tests/test_property_views.py | 36 ++++++++++++++------------- seed/tests/test_taxlot_views.py | 29 +++++++++++++++++++-- seed/views/v3/properties.py | 21 ++++++++-------- seed/views/v3/taxlots.py | 20 ++++++++------- 14 files changed, 102 insertions(+), 46 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo index 3d8f1e37a3b3a8b0054aa2ef2e66b1a7fc0f1930..e7f63b175dbd952b5336647da3b35c2c112b6d30 100644 GIT binary patch delta 32861 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 diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 11d5a1e592..670ad3d9cb 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -1839,6 +1839,9 @@ msgstr "Hello %(first_name)s, " msgid "Hexagonal Bins" msgstr "Hexagonal Bins" +msgid "Hide All Labels" +msgstr "Hide All Labels" + msgid "Highlights of SEED Platform™" msgstr "Highlights of SEED Platform™" @@ -3637,6 +3640,9 @@ msgstr "Sharing Your Data" msgid "Show All" msgstr "Show All" +msgid "Show All Labels" +msgstr "Show All Labels" + msgid "Show Matched" msgstr "Show Matched" @@ -3970,7 +3976,7 @@ msgid "This password must contain at least %(quantity)d %(type)s characters." msgstr "This password must contain at least %(quantity)d %(type)s characters." msgid "This will reset your visible columns and column order to only columns that contain data. Are you sure you want to continue?" -msgstr "This will reset your visible columns and column order to only non-derived columns that contain data. Are you sure you want to continue?" +msgstr "This will reset your visible columns and column order to show only columns that contain data. Are you sure you want to continue?" msgid "Time Period" msgstr "Time Period" diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo index 5f01397b525b6e3e44e1635be76983ddb2a9e9c0..47a9c932d7d6839894eaaf0db7b32529e2cb57ae 100644 GIT binary patch delta 1848 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:: note.name $} {$ note.text $} - +
Edit(s):
  • {$:: log.field $} updated from "{$:: log.previous_value $}" to "{$:: log.new_value $}"
+ {$ note.text $}
-
Are you sure you want to unmerge these properties?
+
UNMERGE_PROPERTIES_MODAL
Properties with elements cannot be unmerged.
Are you sure you want to unmerge these tax lots?
diff --git a/seed/static/seed/partials/update_derived_data_modal.html b/seed/static/seed/partials/update_derived_data_modal.html index 0f4c9bd2d1..09686d6ace 100644 --- a/seed/static/seed/partials/update_derived_data_modal.html +++ b/seed/static/seed/partials/update_derived_data_modal.html @@ -2,11 +2,26 @@
-

UPDATE_DERIVED_DATA_TEXT_1

+
+

UPDATE_DERIVED_DATA_TEXT_1

-

UPDATE_DERIVED_DATA_TEXT_2

+

UPDATE_DERIVED_DATA_TEXT_2

+
+ +
+
+
+ Updating derived data... +
+ +
{$ uploader.progress | number:0 $}% {$:: 'Complete' | translate $} {$ uploader.status_message ? ': ' + uploader.status_message : '' $}
+
+
+
+
+
- - + +
diff --git a/seed/tasks.py b/seed/tasks.py index d8793ceb9c..9e61a209ed 100644 --- a/seed/tasks.py +++ b/seed/tasks.py @@ -7,6 +7,7 @@ import math import sys from datetime import datetime +from random import randint import pytz from celery import chain, chord, shared_task @@ -535,6 +536,11 @@ def set_update_to_now(property_view_ids, taxlot_view_ids, progress_key): @shared_task def update_state_derived_data(property_state_ids=[], taxlot_state_ids=[], derived_column_ids=[]): + progress_data = ProgressData(func_name="update_derived_data", unique_id=randint(10000, 99999)) + progress_data.total = len(property_state_ids) + len(taxlot_state_ids) + progress_data.save() + progress_key = progress_data.key + chunk_size = 100 derived_columns = DerivedColumn.objects.filter(id__in=derived_column_ids) @@ -543,15 +549,19 @@ def update_state_derived_data(property_state_ids=[], taxlot_state_ids=[], derive tasks = [] for chunk_ids in batch(property_state_ids, chunk_size): - tasks.append(_update_property_state_derived_data_chunk.si(chunk_ids, property_derived_column_ids)) + tasks.append(_update_property_state_derived_data_chunk.si(progress_key, chunk_ids, property_derived_column_ids)) for chunk_ids in batch(taxlot_state_ids, chunk_size): - tasks.append(_update_taxlot_state_derived_data_chunk.si(chunk_ids, taxlot_derived_column_ids)) + tasks.append(_update_taxlot_state_derived_data_chunk.si(progress_key, chunk_ids, taxlot_derived_column_ids)) - chord(tasks, interval=15)(_finish_update_state_derived_data.si(property_derived_column_ids + taxlot_derived_column_ids)) + chord(tasks, interval=15)(_finish_update_state_derived_data.si(progress_key, property_derived_column_ids + taxlot_derived_column_ids)) + + return progress_data.result() @shared_task -def _update_property_state_derived_data_chunk(property_state_ids=[], derived_column_ids=[]): +def _update_property_state_derived_data_chunk(progress_key, property_state_ids=[], derived_column_ids=[]): + progress_data = ProgressData.from_key(progress_key) + states = PropertyState.objects.filter(id__in=property_state_ids) derived_columns = DerivedColumn.objects.filter(id__in=derived_column_ids) @@ -559,10 +569,13 @@ def _update_property_state_derived_data_chunk(property_state_ids=[], derived_col for derived_column in derived_columns: state.derived_data[derived_column.name] = derived_column.evaluate(state) state.save() + progress_data.step() @shared_task -def _update_taxlot_state_derived_data_chunk(taxlot_state_ids=[], derived_column_ids=[]): +def _update_taxlot_state_derived_data_chunk(progress_key, taxlot_state_ids=[], derived_column_ids=[]): + progress_data = ProgressData.from_key(progress_key) + states = TaxLotState.objects.filter(id__in=taxlot_state_ids) derived_columns = DerivedColumn.objects.filter(id__in=derived_column_ids) @@ -570,9 +583,13 @@ def _update_taxlot_state_derived_data_chunk(taxlot_state_ids=[], derived_column_ for derived_column in derived_columns: state.derived_data[derived_column.name] = derived_column.evaluate(state) state.save() + progress_data.step() @shared_task -def _finish_update_state_derived_data(derived_column_ids): +def _finish_update_state_derived_data(progress_key, derived_column_ids): derived_columns = DerivedColumn.objects.filter(id__in=derived_column_ids) Column.objects.filter(derived_column__in=derived_columns).update(is_updating=False) + + progress_data = ProgressData.from_key(progress_key) + progress_data.finish_with_success("Updated Derived Data") diff --git a/seed/views/v3/tax_lot_properties.py b/seed/views/v3/tax_lot_properties.py index 3ad873ab11..8b4d15af37 100644 --- a/seed/views/v3/tax_lot_properties.py +++ b/seed/views/v3/tax_lot_properties.py @@ -674,8 +674,8 @@ def update_derived_data(self, request): derived_column_ids = list(derived_columns.values_list("id", flat=True)) # update - update_state_derived_data( + result = update_state_derived_data( property_state_ids=property_state_ids, taxlot_state_ids=taxlot_state_ids, derived_column_ids=derived_column_ids ) - return JsonResponse({"result": "success"}) + return JsonResponse(result) From adb3caad40c043f22f22bbbba78fcc8ccd2b9f7d Mon Sep 17 00:00:00 2001 From: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:46:11 -0700 Subject: [PATCH 05/14] update aggregation table (#4878) * update aggregation table * precommit --- .../seed/partials/inventory_reports.html | 94 ++++++++++++++----- seed/static/seed/scss/style.scss | 6 ++ seed/views/v3/organizations.py | 35 +++++-- 3 files changed, 103 insertions(+), 32 deletions(-) diff --git a/seed/static/seed/partials/inventory_reports.html b/seed/static/seed/partials/inventory_reports.html index 8044d5ac2d..f612743d0e 100644 --- a/seed/static/seed/partials/inventory_reports.html +++ b/seed/static/seed/partials/inventory_reports.html @@ -236,28 +236,78 @@

{$ chart2Title | translate $} 

- - - - - - - - - - - - - - - - - - - - - -
AxisAccess Level InstanceSumMin5th Percentile25th PercentileMeanMedian75 Percentile95th PercentileMax
{$ item $}
+

Statistics

+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
AxisAccess Level InstanceSumMin5th Percentile25th PercentileMeanMedian75 Percentile95th PercentileMax
{$ key $} + {$ item $} + {$ item | tolerantNumber:2 $} + + + + +
+ + + + + + +
 {$ key2 $} + {$ item $} + {$ item | tolerantNumber:2 $} +
+
+
+
diff --git a/seed/static/seed/scss/style.scss b/seed/static/seed/scss/style.scss index a091629aaf..2367f5af8a 100755 --- a/seed/static/seed/scss/style.scss +++ b/seed/static/seed/scss/style.scss @@ -5683,3 +5683,9 @@ tags-input .tags .tag-item { white-space: normal; min-width: 350px; } + +.no-lr-pad { + padding-left: 0 !important; + padding-right: 0 !important; + padding-top: 0 !important; +} diff --git a/seed/views/v3/organizations.py b/seed/views/v3/organizations.py index 0367424072..364ef679b3 100644 --- a/seed/views/v3/organizations.py +++ b/seed/views/v3/organizations.py @@ -1024,6 +1024,12 @@ def report_aggregated(self, request, pk=None): ys = [building["y"] for datum in data for building in datum["chart_data"] if building["y"] is not None] if ys and isinstance(ys[0], Number): bins = np.histogram_bin_edges(ys, bins=5) + + # special case for year built: make bins integers + # year built is in x axis, but it shows up in y_var variable + if params["y_var"] == "year_built": + bins = bins.astype(int) + aggregate_data = self.continuous_aggregate_data else: bins = list(set(ys)) @@ -1243,15 +1249,19 @@ def get_axis_stats(self, organization, cycle, axis, axis_var, views, ali): return [axis_var, ali.name, 0, 0, 0, 0, 0, 0, 0, 0, 0] def get_axis_data(self, organization_id, access_level_instance, cycles, x_var, y_var, all_property_views, fields): - axis_data = [] + axis_data = {} axes = {"x": x_var, "y": y_var} organization = Organization.objects.get(pk=organization_id) + # initialize + for cycle in cycles: + axis_data[cycle.name] = {} + for axis in axes: if axes[axis] != "Count": columns = Column.objects.filter(organization_id=organization_id, column_name=axes[axis]) if not columns: - return [] + return {} column = columns[0] if not column.data_type or column.data_type == "None": @@ -1266,19 +1276,24 @@ def get_axis_data(self, organization_id, access_level_instance, cycles, x_var, y name_to_display = ( serialized_column["display_name"] if serialized_column["display_name"] != "" else serialized_column["column_name"] ) - axis_name = name_to_display + f" ({cycle.name})" + axis_data[cycle.name][name_to_display] = {} stats = self.get_axis_stats(organization, cycle, axis, axes[axis], all_property_views, access_level_instance) - axis_data.append(self.clean_axis_data(axis_name, data_type, stats)) - for child_ali in access_level_instance.get_children(): - stats = self.get_axis_stats(organization, cycle, axis, axes[axis], all_property_views, child_ali) - axis_data.append(self.clean_axis_data(axis_name, data_type, stats)) + axis_data[cycle.name][name_to_display]["values"] = self.clean_axis_data(data_type, stats) + + children = access_level_instance.get_children() + if len(children): + axis_data[cycle.name][name_to_display]["children"] = {} + for child_ali in children: + stats = self.get_axis_stats(organization, cycle, axis, axes[axis], all_property_views, child_ali) + axis_data[cycle.name][name_to_display]["children"][child_ali.name] = self.clean_axis_data(data_type, stats) + return axis_data - def clean_axis_data(self, column_name, data_type, data): + def clean_axis_data(self, data_type, data): if data_type == "float": - return [column_name] + data[1:3] + np.round(data[3:], decimals=2).tolist() + return data[1:3] + np.round(data[3:], decimals=2).tolist() elif data_type == "integer": - return [column_name] + data[1:3] + np.round(data[3:]).tolist() + return data[1:3] + np.round(data[3:]).tolist() @has_perm_class("requires_member") @ajax_request_class From de11e2a977dfdd6a1d4e33c0676c81df3cd18167 Mon Sep 17 00:00:00 2001 From: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Date: Fri, 8 Nov 2024 16:29:59 -0700 Subject: [PATCH 06/14] Fix stats table for various ali layouts (#4880) fix stats table for different alis --- .../js/controllers/inventory_reports_controller.js | 10 ++++++++++ seed/static/seed/partials/inventory_reports.html | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/seed/static/seed/js/controllers/inventory_reports_controller.js b/seed/static/seed/js/controllers/inventory_reports_controller.js index 0d322b260e..2eed57e7ba 100644 --- a/seed/static/seed/js/controllers/inventory_reports_controller.js +++ b/seed/static/seed/js/controllers/inventory_reports_controller.js @@ -65,6 +65,16 @@ angular.module('SEED.controller.inventory_reports', []).controller('inventory_re $scope.filter_groups = filter_groups; $scope.report_configurations = report_configurations; $scope.filter_group_id = null; + + $scope.has_children = (obj) => { + // check if the access level selected has children levels for stats table + let children = false; + if ('children' in obj && Object.keys(obj.children).length > 0) { + children = true; + } + return children; + }; + function path_to_string(path) { const orderedPath = []; for (const i in $scope.level_names) { diff --git a/seed/static/seed/partials/inventory_reports.html b/seed/static/seed/partials/inventory_reports.html index f612743d0e..2e8b4936ce 100644 --- a/seed/static/seed/partials/inventory_reports.html +++ b/seed/static/seed/partials/inventory_reports.html @@ -267,14 +267,13 @@

Statistics

Max - + {$ key $} {$ item $} {$ item | tolerantNumber:2 $} - - +