diff --git a/db_backup/bootstrap.sh b/db_backup/bootstrap.sh index cdd89d6..ee0bf74 100755 --- a/db_backup/bootstrap.sh +++ b/db_backup/bootstrap.sh @@ -1,2 +1,2 @@ # assumes there is already a database called openousd -pg_restore -U postgres --clean -d openousd /db_backup/snapshots/openousd_snapshot_2021-09-25_20-17-2020-21-expenditures.dump +pg_restore -U postgres --clean -d openousd /db_backup/snapshots/openousd_snapshot_2023-02-24_03-36-2021-22-update-fix-staff-roles.dump diff --git a/db_backup/snapshots/openousd_snapshot_2023-02-14_00-13-2021-22-staffing-update.dump b/db_backup/snapshots/openousd_snapshot_2023-02-14_00-13-2021-22-staffing-update.dump new file mode 100644 index 0000000..0320fc4 Binary files /dev/null and b/db_backup/snapshots/openousd_snapshot_2023-02-14_00-13-2021-22-staffing-update.dump differ diff --git a/db_backup/snapshots/openousd_snapshot_2023-02-14_20-53-2021-22-expenditures-update.dump b/db_backup/snapshots/openousd_snapshot_2023-02-14_20-53-2021-22-expenditures-update.dump new file mode 100644 index 0000000..c834b94 Binary files /dev/null and b/db_backup/snapshots/openousd_snapshot_2023-02-14_20-53-2021-22-expenditures-update.dump differ diff --git a/db_backup/snapshots/openousd_snapshot_2023-02-14_23-47-sites-and-objects.dump b/db_backup/snapshots/openousd_snapshot_2023-02-14_23-47-sites-and-objects.dump new file mode 100644 index 0000000..1b79d00 Binary files /dev/null and b/db_backup/snapshots/openousd_snapshot_2023-02-14_23-47-sites-and-objects.dump differ diff --git a/db_backup/snapshots/openousd_snapshot_2023-02-14_23-51-new-resources.dump b/db_backup/snapshots/openousd_snapshot_2023-02-14_23-51-new-resources.dump new file mode 100644 index 0000000..f01df98 Binary files /dev/null and b/db_backup/snapshots/openousd_snapshot_2023-02-14_23-51-new-resources.dump differ diff --git a/db_backup/snapshots/openousd_snapshot_2023-02-15_00-07-2021-22-update-complete-functions.dump b/db_backup/snapshots/openousd_snapshot_2023-02-15_00-07-2021-22-update-complete-functions.dump new file mode 100644 index 0000000..5eeac27 Binary files /dev/null and b/db_backup/snapshots/openousd_snapshot_2023-02-15_00-07-2021-22-update-complete-functions.dump differ diff --git a/db_backup/snapshots/openousd_snapshot_2023-02-24_03-36-2021-22-update-fix-staff-roles.dump b/db_backup/snapshots/openousd_snapshot_2023-02-24_03-36-2021-22-update-fix-staff-roles.dump new file mode 100644 index 0000000..1400a26 Binary files /dev/null and b/db_backup/snapshots/openousd_snapshot_2023-02-24_03-36-2021-22-update-fix-staff-roles.dump differ diff --git a/routes/index.js b/routes/index.js index 5b01e8b..775db8f 100644 --- a/routes/index.js +++ b/routes/index.js @@ -37,7 +37,7 @@ if (!pgPool) { pgPool.on("error", (err, client) => console.log(err)) // Global defaults -const latestYear = 2020 +const latestYear = 2021 const router = Router() @@ -93,7 +93,7 @@ router.get("/central-programs", async (req, res, next) => { job_classes jc, staffing st WHERE m.position_id = st.position_id - AND st.job_class_id = jc.job_class_id + AND TRIM(st.job_class_id) = jc.job_class_id AND m.max_assignment = st.assignment_id AND st.site_code >= 900 AND year = ${year}