Adds more fields and filters to the locations list

database/metadata/databases/default/tables/public_locations_list_view.yaml

@@ -5,12 +5,18 @@ select_permissions:
   - role: editor
     permission:
       columns:
+        - apd_sectors
+        - area_eng_areas
+        - signal_eng_areas
+        - street_levels
         - cr3_crash_count
         - crash_count
         - non_cr3_crash_count
         - total_est_comp_cost
+        - is_hin
+        - is_signalized
         - location_id
-        - council_district
+        - council_districts
         - location_group
         - location_name
       filter: {}
@@ -19,12 +25,18 @@ select_permissions:
   - role: readonly
     permission:
       columns:
+        - apd_sectors
+        - area_eng_areas
+        - signal_eng_areas
+        - street_levels
         - cr3_crash_count
         - crash_count
         - non_cr3_crash_count
         - total_est_comp_cost
+        - is_hin
+        - is_signalized
         - location_id
-        - council_district
+        - council_districts
         - location_group
         - location_name
       filter: {}
@@ -33,12 +45,18 @@ select_permissions:
   - role: vz-admin
     permission:
       columns:
+        - apd_sectors
+        - area_eng_areas
+        - signal_eng_areas
+        - street_levels
         - cr3_crash_count
         - crash_count
         - non_cr3_crash_count
         - total_est_comp_cost
+        - is_hin
+        - is_signalized
         - location_id
-        - council_district
+        - council_districts
         - location_group
         - location_name
       filter: {}

database/migrations/default/1771530231604_locations_list_view_more_cols/down.sql

@@ -0,0 +1,57 @@
+CREATE OR REPLACE VIEW locations_list_view AS WITH cr3_comp_costs AS (
+    SELECT
+        crashes_list_view.location_id,
+        sum(crashes_list_view.est_comp_cost_crash_based) AS cr3_comp_costs_total
+    FROM crashes_list_view
+    WHERE crashes_list_view.crash_timestamp > (now() - '5 years'::interval)
+    GROUP BY crashes_list_view.location_id
+),
+
+cr3_crash_counts AS (
+    SELECT
+        crashes.location_id,
+        count(crashes.location_id) AS crash_count
+    FROM crashes
+    WHERE
+        crashes.private_dr_fl = false
+        AND crashes.location_id IS NOT null
+        AND crashes.crash_timestamp > (now() - '5 years'::interval)
+    GROUP BY crashes.location_id
+),
+
+non_cr3_crash_counts AS (
+    SELECT
+        atd_apd_blueform.location_id,
+        count(atd_apd_blueform.location_id)         AS crash_count,
+        count(atd_apd_blueform.location_id) * 10000 AS noncr3_comp_costs_total
+    FROM atd_apd_blueform
+    WHERE
+        atd_apd_blueform.location_id IS NOT null
+        AND atd_apd_blueform.is_deleted = false
+        AND atd_apd_blueform.case_timestamp > (now() - '5 years'::interval)
+    GROUP BY atd_apd_blueform.location_id
+)
+
+SELECT
+    locations.location_id,
+    locations.location_name,
+    locations.council_district,
+    locations.location_group,
+    coalesce(
+        cr3_comp_costs.cr3_comp_costs_total + non_cr3_crash_counts.noncr3_comp_costs_total,
+        0::bigint
+    )                                                       AS total_est_comp_cost,
+    coalesce(
+        cr3_crash_counts.crash_count, 0::bigint
+    )                                                       AS cr3_crash_count,
+    coalesce(
+        non_cr3_crash_counts.crash_count, 0::bigint
+    )                                                       AS non_cr3_crash_count,
+    coalesce(cr3_crash_counts.crash_count, 0::bigint)
+    + coalesce(non_cr3_crash_counts.crash_count, 0::bigint) AS crash_count
+FROM locations
+LEFT JOIN cr3_crash_counts ON locations.location_id::text = cr3_crash_counts.location_id
+LEFT JOIN
+    non_cr3_crash_counts
+    ON locations.location_id::text = non_cr3_crash_counts.location_id::text
+LEFT JOIN cr3_comp_costs ON locations.location_id::text = cr3_comp_costs.location_id;

database/migrations/default/1771530231604_locations_list_view_more_cols/up.sql

@@ -0,0 +1,40 @@
+drop view locations_list_view;
+create or replace view locations_list_view as 
+ WITH cr3_comp_costs AS (
+         SELECT crashes_list_view.location_id,
+            sum(crashes_list_view.est_comp_cost_crash_based) AS cr3_comp_costs_total
+           FROM crashes_list_view
+          WHERE crashes_list_view.crash_timestamp > (now() - '5 years'::interval)
+          GROUP BY crashes_list_view.location_id
+        ), cr3_crash_counts AS (
+         SELECT crashes.location_id,
+            count(crashes.location_id) AS crash_count
+           FROM crashes
+          WHERE crashes.private_dr_fl = false AND crashes.location_id IS NOT NULL AND crashes.crash_timestamp > (now() - '5 years'::interval)
+          GROUP BY crashes.location_id
+        ), non_cr3_crash_counts AS (
+         SELECT atd_apd_blueform.location_id,
+            count(atd_apd_blueform.location_id) AS crash_count,
+            count(atd_apd_blueform.location_id) * 10000 AS noncr3_comp_costs_total
+           FROM atd_apd_blueform
+          WHERE atd_apd_blueform.location_id IS NOT NULL AND atd_apd_blueform.is_deleted = false AND atd_apd_blueform.case_timestamp > (now() - '5 years'::interval)
+          GROUP BY atd_apd_blueform.location_id
+        )
+ SELECT locations.location_id,
+    locations.location_name,
+    locations.council_districts,
+    locations.location_group,
+    locations.is_signalized,
+    locations.signal_eng_areas,
+    locations.area_eng_areas,
+    locations.street_levels,
+    locations.apd_sectors,
+    locations.is_hin,
+    COALESCE(cr3_comp_costs.cr3_comp_costs_total + non_cr3_crash_counts.noncr3_comp_costs_total, 0::bigint) AS total_est_comp_cost,
+    COALESCE(cr3_crash_counts.crash_count, 0::bigint) AS cr3_crash_count,
+    COALESCE(non_cr3_crash_counts.crash_count, 0::bigint) AS non_cr3_crash_count,
+    COALESCE(cr3_crash_counts.crash_count, 0::bigint) + COALESCE(non_cr3_crash_counts.crash_count, 0::bigint) AS crash_count
+   FROM locations
+     LEFT JOIN cr3_crash_counts ON locations.location_id::text = cr3_crash_counts.location_id
+     LEFT JOIN non_cr3_crash_counts ON locations.location_id::text = non_cr3_crash_counts.location_id::text
+     LEFT JOIN cr3_comp_costs ON locations.location_id::text = cr3_comp_costs.location_id;

database/views/locations_list_view.sql

@@ -37,8 +37,14 @@ non_cr3_crash_counts AS (
 SELECT
     locations.location_id,
     locations.location_name,
-    locations.council_district,
+    locations.council_districts,
     locations.location_group,
+    locations.is_signalized,
+    locations.signal_eng_areas,
+    locations.area_eng_areas,
+    locations.street_levels,
+    locations.apd_sectors,
+    locations.is_hin,
     coalesce(
         cr3_comp_costs.cr3_comp_costs_total + non_cr3_crash_counts.noncr3_comp_costs_total,
         0::bigint

database/views/materialized/location_crashes_view.sql

@@ -1,10 +1,11 @@
--- Most recent migration: database/migrations/default/1767430748998_crash_address_display_trigger/up.sql
+-- Most recent migration: database/migrations/default/1771445809119_update_location_crashes_view/up.sql
 
 DROP MATERIALIZED VIEW IF EXISTS location_crashes_view;
 
 CREATE MATERIALIZED VIEW location_crashes_view AS SELECT
     crashes.record_locator,
     crashes.cris_crash_id,
+    crashes.id                                   AS crash_pk,
     'CR3'::text                                  AS type,
     crashes.location_id,
     crashes.case_id,
@@ -87,6 +88,7 @@ UNION ALL
 SELECT
     null::text                                                                        AS record_locator,
     aab.form_id                                                                       AS cris_crash_id,
+    null::integer                                                                     AS crash_pk,
     'NON-CR3'::text                                                                   AS type,
     aab.location_id,
     aab.case_id::text                                                                 AS case_id,

editor/configs/locationColumns.ts

@@ -1,6 +1,10 @@
 import { ColDataCardDef } from "@/types/types";
 import { Location } from "@/types/locations";
-import { formatArrayToString, formatDollars } from "@/utils/formatters";
+import {
+  formatArrayToString,
+  formatDollars,
+  formatYesNoString,
+} from "@/utils/formatters";
 
 export const locationColumns = {
   location_id: {
@@ -25,4 +29,43 @@ export const locationColumns = {
     label: "ASMP Street level(s)",
     valueFormatter: formatArrayToString,
   },
+  apd_sectors: {
+    path: "apd_sectors",
+    label: "APD sector(s)",
+    sortable: false,
+    defaultHidden: false,
+    valueFormatter: formatArrayToString,
+  },
+  area_eng_areas: {
+    path: "area_eng_areas",
+    label: "Area engineer",
+    sortable: false,
+    valueFormatter: formatArrayToString,
+  },
+  signal_eng_areas: {
+    path: "signal_eng_areas",
+    label: "Signal engineer",
+    sortable: false,
+    valueFormatter: formatArrayToString,
+  },
+  council_districts: {
+    path: "council_districts",
+    label: "Council district(s)",
+    sortable: false,
+    valueFormatter: formatArrayToString,
+  },
+  is_hin: {
+    path: "is_hin",
+    label: "High injury network",
+    sortable: true,
+    defaultHidden: false,
+    valueFormatter: formatYesNoString,
+  },
+  is_signalized: {
+    path: "is_signalized",
+    label: "Signalized",
+    sortable: true,
+    defaultHidden: false,
+    valueFormatter: formatYesNoString,
+  },
 } satisfies Record<string, ColDataCardDef<Location>>;

editor/configs/locationDataCard.ts

@@ -1,9 +1,14 @@
 import { locationColumns } from "./locationColumns";
 
 export const locationCardColumns = [
-  locationColumns.location_id,
   locationColumns.cr3_crash_count,
   locationColumns.non_cr3_crash_count,
   locationColumns.total_est_comp_cost,
   locationColumns.street_level,
+  locationColumns.area_eng_areas,
+  locationColumns.signal_eng_areas,
+  locationColumns.is_signalized,
+  locationColumns.council_districts,
+  locationColumns.is_hin,
+  locationColumns.apd_sectors
 ];

editor/configs/locationsListViewColumns.tsx

@@ -1,6 +1,7 @@
 import Link from "next/link";
 import { ColDataCardDef } from "@/types/types";
 import { LocationsListRow } from "@/types/locationsList";
+import { locationColumns } from "@/configs/locationColumns";
 
 export const locationsListViewColumns: ColDataCardDef<LocationsListRow>[] = [
   {
@@ -17,6 +18,12 @@ export const locationsListViewColumns: ColDataCardDef<LocationsListRow>[] = [
     path: "location_name",
     label: "Location",
     sortable: true,
+    style: {
+      maxWidth: "30rem",
+      overflow: "hidden",
+      textOverflow: "ellipsis",
+      whiteSpace: "nowrap",
+    },
   },
   {
     path: "cr3_crash_count",
@@ -28,4 +35,11 @@ export const locationsListViewColumns: ColDataCardDef<LocationsListRow>[] = [
     label: "Non-CR3 crashes",
     sortable: true,
   },
+  locationColumns.area_eng_areas,
+  locationColumns.signal_eng_areas,
+  locationColumns.is_signalized,
+  locationColumns.council_districts,
+  { ...locationColumns.street_level, defaultHidden: true },
+  { ...locationColumns.apd_sectors, defaultHidden: true },
+  { ...locationColumns.is_hin, defaultHidden: true },
 ];