Merge branch 'production' into 0.7.0-release-candidate

cityofaustin · Jun 25, 2021 · 9c2c625 · 9c2c625
2 parents 7b2e3e5 + fc50e18
commit 9c2c625
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/moped-database/metadata/tables.yaml b/moped-database/metadata/tables.yaml
@@ -4655,6 +4655,7 @@
       - fiscal_year
       - is_retired
       - milestone_id
+      - phase_name
       - project_description
       - project_description_public
       - project_id
@@ -4684,6 +4685,7 @@
       - fiscal_year
       - is_retired
       - milestone_id
+      - phase_name
       - project_description
       - project_description_public
       - project_id
@@ -4713,6 +4715,7 @@
       - fiscal_year
       - is_retired
       - milestone_id
+      - phase_name
       - project_description
       - project_description_public
       - project_id

diff --git a/moped-database/migrations/1623358779761_run_sql_migration/up.sql b/moped-database/migrations/1623358779761_run_sql_migration/up.sql
@@ -0,0 +1,32 @@
+CREATE OR REPLACE VIEW "public"."project_list_view" AS 
+ SELECT mp.project_uuid,
+    mp.project_id,
+    mp.project_name,
+    mp.project_description,
+    mp.project_description_public,
+    mp.ecapris_subproject_id,
+    mp.project_importance,
+    mp.project_order,
+    mp.current_status,
+    mp.timeline_id,
+    mp.current_phase,
+    mp.end_date,
+    mp.project_length,
+    mp.start_date,
+    mp.fiscal_year,
+    mp.capitally_funded,
+    mp.project_priority,
+    mp.date_added,
+    mp.added_by,
+    mp.is_retired,
+    mp.milestone_id,
+    mp.status_id,
+    string_agg(concat(mu.first_name, ' ', mu.last_name, ':', mpr.project_role_name), ','::text) AS project_team_members,
+    mp.updated_at,
+    mpph.phase_name
+   FROM ((((moped_project mp
+     LEFT JOIN moped_proj_personnel mpp ON (((mp.project_id = mpp.project_id) AND (mpp.status_id = 1))))
+     LEFT JOIN moped_users mu ON ((mpp.user_id = mu.user_id)))
+     LEFT JOIN moped_project_roles mpr ON ((mpp.role_id = mpr.project_role_id)))
+     LEFT JOIN moped_proj_phases mpph ON ((mp.project_id = mpph.project_id)) AND mpph.is_current_phase = true)
+  GROUP BY mp.project_uuid, mp.project_id, mp.project_name, mp.project_description, mp.project_description_public, mp.ecapris_subproject_id, mp.project_importance, mp.project_order, mp.current_status, mp.timeline_id, mp.current_phase, mp.end_date, mp.project_length, mp.start_date, mp.fiscal_year, mp.capitally_funded, mp.project_priority, mp.date_added, mp.added_by, mp.is_retired, mp.milestone_id, mp.status_id, mp.updated_at, mpph.phase_name;
diff --git a/moped-editor/src/views/projects/projectsListView/ProjectsListViewQueryConf.js b/moped-editor/src/views/projects/projectsListView/ProjectsListViewQueryConf.js
@@ -103,7 +103,7 @@ export const ProjectsListViewQueryConf = {
         canceled: "default",
       },
     },
-    current_phase: {
+    phase_name: {
       searchable: true,
       sortable: false,
       label: "Current phase",