Squashed commit of the following:

commit 676b021a158bcc97a56ced0cd7e9ac78bb0ec417
Author: tmahtab <[email protected]>
Date:   Fri Jan 6 15:02:58 2023 -0800

    Updating version.

commit 2dd83315682899fcaffa9937a6c7067f65deb69e
Author: tmahtab <[email protected]>
Date:   Fri Jan 6 14:56:42 2023 -0800

    Data migration scripts for travel patterns release

commit 72e4843c212bd491ec9a1001c0e72d133226d50d
Author: Drew Teter <[email protected]>
Date:   Fri Dec 30 16:18:20 2022 -0500

    Adding back indexes that were removed during a merge.

commit cedda8fbf3c80769426ac0addf10152e50f91c6b
Author: Drew Teter <[email protected]>
Date:   Fri Dec 30 14:54:15 2022 -0500

    OCC-1120 Duplicate Trips

commit f8ebb39881c07ea332b1776fb2071296c50dfae0
Author: tmahtab <[email protected]>
Date:   Fri Dec 30 11:52:17 2022 -0800

    Setting max-width to prevent overflow.(OCC-927)

commit 58c5934d6bcc62e096a276beeffa866405de6913
Author: tmahtab <[email protected]>
Date:   Thu Dec 29 13:43:16 2022 -0800

    Fixed 500 error on saving invalid name.(OCC-1129)

commit fcc510711a3c6b0309dadef8921214fea0996f0e
Author: tmahtab <[email protected]>
Date:   Wed Dec 28 14:56:09 2022 -0800

    Cleanup and handle empty set of POIs added to zone.(OCC-1072)

commit f5b4811067aa179f82c6a871ba16986debb9acce
Author: tmahtab <[email protected]>
Date:   Wed Dec 28 09:10:53 2022 -0800

    Updating version

commit a684996280fb0469670437e1ffcad881e5522dcf
Author: tmahtab <[email protected]>
Date:   Tue Dec 27 17:07:53 2022 -0800

    Add error handling related to landmark sets.(OCC-786)

commit 65cf63d999ea9a21df70af37c20823b3c1214f2d
Author: aandrade <[email protected]>
Date:   Tue Dec 27 14:11:00 2022 -0500

    [OCC-1112] Add database indexes to improve performance of trips report and requests report

commit b4c3db15970fefb8302e2f8e2eccf44ef94f9fb9
Author: aandrade <[email protected]>
Date:   Tue Dec 27 13:55:05 2022 -0500

    [OCC-1117, OCC-1118] Allow valid service schedule time slots to save when invalid ones are deleted.

commit da29fe8da770b91dfeec59b00e3d49b79a542909
Author: Drew Teter <[email protected]>
Date:   Fri Dec 16 10:28:59 2022 -0500

    OCC-1052 and OCC-1106

commit 8e4fb32994b9cc065ebc878c0dd33f033516a08d
Author: tmahtab <[email protected]>
Date:   Thu Dec 15 16:16:29 2022 -0800

    Reverting to earlier version of workflow for build_1click_funding_hash.(OCC-1110)

commit fdf624842e4ea9d2d718a3561f7a79b176ac6f4a
Author: tmahtab <[email protected]>
Date:   Thu Dec 15 16:14:54 2022 -0800

    Permitted additional separators.(OCC-1107)

commit c727ff17aade87743e7a0f1421e21d1491e8c4fc
Author: aandrade <[email protected]>
Date:   Thu Dec 15 18:22:25 2022 -0500

    [OCC-1113] Check for null trip details before assigning trip type when canceling a trip

commit e5d8062ab0ac37b217ba5668e20a34c480fc3a42
Author: Drew Teter <[email protected]>
Date:   Wed Dec 14 15:03:53 2022 -0500

    OCC-1052 Fares are now calculated correctly for trips with companions

commit 1a38743524bf55568bb23b26f00b1df64c942414
Author: tmahtab <[email protected]>
Date:   Tue Dec 13 15:19:55 2022 -0800

    Fix with_home_county scope to distinguish counties that start with same string.(OCC-1107)

commit 7e62270df25117eba7f924666020d560ff58afa2
Author: W. Scott Meeks <[email protected]>
Date:   Fri Dec 9 14:20:18 2022 -0500

    Update .gitignore

commit c6ff3739bdc80b9b69da1a275fa4dbbfc02b0676
Merge: 38d72c1 cb87686
Author: drewteter <[email protected]>
Date:   Tue Dec 6 15:26:33 2022 -0500

    Merge pull request #266 from camsys/travel_pattern_funding_sources

    PAMF-845 OCC-1096 OCC-811

commit cb876861ecfa4ceab6568e4966ce313560162df1
Author: Drew Teter <[email protected]>
Date:   Fri Dec 2 16:00:18 2022 -0500

    PAMF-845 OCC-1096 OCC-811

    Rewrote funding source logic to handle travel patterns. Fixed minor bugs

commit 38d72c1050ebfc6a763d24d39fe9028e5e563be1
Author: Alex Andrade <[email protected]>
Date:   Fri Dec 2 16:59:16 2022 -0500

    Occ 816 fmr 174 (#261)

    * [OCC-816, FMR-174] Change created_in_1click filter in trips report to execute single 'where' query, reorder to apply after all other filters

    * [OCC-816, FMR-174] Enable CSV Writer to set a limit on number of rows written/records parsed. Set limit of 50000 records returned on trips report.

    * [OCC-816, FMR-174] Add limits to requests report, add a default limit to CSVWriter, add messages on trips report form, requests report form, and the reports themselves indicating record limits

commit b3fd2eb75078d8bf7ea6ecf0972980ea10739bb1
Author: Drew Teter <[email protected]>
Date:   Fri Dec 2 14:58:23 2022 -0500

    QA hotfix

commit f6f2361a17a3c96bd806f71e7dee641a2b4e649a
Author: Drew Teter <[email protected]>
Date:   Mon Nov 28 12:27:51 2022 -0500

    OCC-1080 Trip Disposition Status updated for ecolane denial

commit 149a7519183cfa81a8ea320edcfa35a2ddf22e35
Merge: 1f4f49f 2336f3b
Author: Drew Teter <[email protected]>
Date:   Mon Nov 28 12:18:48 2022 -0500

    Merge branch 'develop' of github.com:camsys/oneclick-core into develop

commit 1f4f49fa723abbf0168a593096a5739b4b7dbfe9
Author: Drew Teter <[email protected]>
Date:   Mon Nov 28 12:18:29 2022 -0500

    OCC-1089 Travel Patterns now must match the users's service, as determined by their county.

commit 2336f3b25e8a537b315c86bce61faa56218d4467
Merge: d66a364 30ffa96
Author: drewteter <[email protected]>
Date:   Mon Nov 28 11:02:32 2022 -0500

    Merge pull request #264 from camsys/OCC-1076

    OCC-1076

commit d66a3643a3a362ee52b4b649ccb28341a65f1a02
Author: tmahtab <[email protected]>
Date:   Wed Nov 23 12:45:43 2022 -0800

    If the landmark set is updated, update any regions using it.(OCC-1094)

commit ee489695b02c5b2317f44e23aad481eac997a198
Author: tmahtab <[email protected]>
Date:   Mon Nov 21 17:59:23 2022 -0800

    Prevent deletion if in use by a region.(OCC-1072)

commit 8c797b5dee1480d1060f11c09e4ab5e19bd70d0e
Author: tmahtab <[email protected]>
Date:   Mon Nov 21 17:56:56 2022 -0800

    Prevent deletion if in use by a region.(OCC-1071)

commit 16a6a209835f2d66d6182826c26c9af0e9ed14e3
Author: aandrade <[email protected]>
Date:   Mon Nov 21 15:04:21 2022 -0500

    [OCC-940] Add confirmation/error messages when deleting a travel pattern

commit b7dff56a8f92fee69572d28a46c53b8509a8aa15
Author: aandrade <[email protected]>
Date:   Fri Nov 18 16:23:50 2022 -0500

    [OCC-1087] Add backend validation to ensure services may not have duplicate entries for associated travel patterns

commit 30ffa962c8ddb9f58143c6695bbcd3218f3bbbbc
Author: Drew Teter <[email protected]>
Date:   Fri Nov 18 12:53:23 2022 -0500

    OCC-1076 Ecolane booking object was never implemented, implemented it

commit a364513010c92bf73c6b01423cbb95ef2736a4a9
Author: Drew Teter <[email protected]>
Date:   Fri Nov 18 08:28:28 2022 -0500

    OCC-1052 Storing companion information from ecolan in itineraries

commit 9ba08022f27c2540abeb0bbd587c7ab679b2975a
Author: tmahtab <[email protected]>
Date:   Mon Nov 14 17:50:18 2022 -0800

    Added missing case for Select Agency modal.(OCC-1063)

commit ac07089659144229312171f02441c5518b989ab0
Author: tmahtab <[email protected]>
Date:   Mon Nov 14 17:39:00 2022 -0800

    Only show agency emulation drop-down on list views.(OCC-1078)

commit 3be44848846927eacbe05a43b3f1a5443da2656a
Author: aandrade <[email protected]>
Date:   Fri Nov 11 17:58:45 2022 -0500

    [OCC-1074] Add error messages when trying to delete travel pattern components with dependent travel patterns

commit d254f928352f4135f8f113a4f01afa6ea99aaccc
Author: aandrade <[email protected]>
Date:   Fri Nov 11 16:38:37 2022 -0500

     [OCC-1070] Hide trip purposes filter for oversight users acting as oversight agency, show all trip purposes for non-FMR apps.

commit c732e6b98ef73723a33292a630487cf3be605d5f
Author: tmahtab <[email protected]>
Date:   Tue Nov 8 14:22:00 2022 -0800

    Occ 1075 (#263)

    * Check against travel patterns funding sources in build_1click_funding_hash.(OCC-1075)

commit 9d0f6a55189e6a2eff81ecbf45bab44307c6e21f
Author: Drew Teter <[email protected]>
Date:   Fri Nov 4 11:36:59 2022 -0400

    Hotfix travel pattern error message

commit 9affa78842454cf9f07ed8b8f7552fab166eb955
Author: aandrade <[email protected]>
Date:   Wed Nov 2 17:38:01 2022 -0400

     [OCC-1070] Filter trip purposes selectable in trips report to only those for the current user (agency)

commit 000638ad60ce08d1d52fa63da380e231f7afe873
Author: tmahtab <[email protected]>
Date:   Wed Nov 2 11:50:46 2022 -0700

    Change buffer resolution to circular.(OCC-1064)

commit fd36f4ccc1f7b0a712c211b4f15ed4aea10c9b1c
Author: aandrade <[email protected]>
Date:   Tue Nov 1 18:01:36 2022 -0400

     [OCC-1058] Add agency validation to service creation to prevent unintended errors

commit 47bd70c791ce821bc9c5e34254e613469b648757
Author: Drew Teter <[email protected]>
Date:   Tue Nov 1 16:51:24 2022 -0400

    OCC-1073 Fixing bug regarding travel pattern dependancies and validations to allow new travel patterns to be properly saved.

commit d2cf6d5c123b8ed981dab707adec1aea3573c3b7
Author: Drew Teter <[email protected]>
Date:   Fri Oct 28 13:30:09 2022 -0400

    Fixing bug in Travel Pattern Validations that prevents saving.

commit aab23e638d121dba6c3019688bd5a22dde7f6a57
Author: Drew Teter <[email protected]>
Date:   Wed Oct 26 03:04:55 2022 -0400

    OCC-960 Don't delete components if they are depended on by other things

commit ea84497cdc430ea4ccadcf0ebc76c30e321c9719
Author: Drew Teter <[email protected]>
Date:   Wed Oct 26 02:44:37 2022 -0400

    OCC-962 Travel Patterns with no valid booking dates should not match queries to the API

commit 575d223d51827393dc4147599504a2b835606048
Author: Drew Teter <[email protected]>
Date:   Wed Oct 26 01:47:41 2022 -0400

    OCC-1009 Customer lookup should throw a 404, not a 500 when more than one match is found

commit 7dbe1908b333fd221ededad973feded527490864
Author: Drew Teter <[email protected]>
Date:   Wed Oct 26 00:54:33 2022 -0400

    OCC-1006 Travel Patterns should fail if the traveller does not have access to any of the funding sources.

commit 98037c8d607079d4a0d54e79108034ee89274477
Author: Drew Teter <[email protected]>
Date:   Wed Oct 19 09:29:36 2022 -0400

    OCC-963 OCC-964

commit 0edc8edb6f9dbde759569143043dd98a7c67ed95
Author: aandrade <[email protected]>
Date:   Tue Oct 18 14:35:59 2022 -0400

     [OCC-1044] Remove "ADA" placeholder text in permitted funding sources field on edit service form

commit 89b186823f0a580966c2ffe6ff987050fa0ddce9
Author: aandrade <[email protected]>
Date:   Thu Oct 13 15:11:58 2022 -0400

     [OCC-1035] Unmark "ADA Funding Sources", "Dummy/Guest User", "Guest Funding Sources", and "Guest Purpose" fields as required in service funding rules form

commit b54c3688f4a72e9f5888be27d03e881d5e9a1940
Author: aandrade <[email protected]>
Date:   Thu Oct 13 14:29:40 2022 -0400

     [OCC-1036] Rename "Ecolane ID" to "Ecolane Agency Subdomain" under the Booking section in the service detail page

commit 1515ac7ec24449059b6dd109e2779235270748f0
Author: aandrade <[email protected]>
Date:   Thu Oct 13 14:19:37 2022 -0400

     [OCC-818] Hide "Planned By" filter in trips report when using travel patterns configuration

commit 37edb6eab1cdee59240b2fc614df67c11ff0b003
Author: Drew Teter <[email protected]>
Date:   Thu Oct 13 12:51:51 2022 -0400

    OCC-1041

commit 48ad3e927974a3802f05f8f443dc5e75acee646e
Author: Drew Teter <[email protected]>
Date:   Thu Oct 13 11:11:50 2022 -0400

    OCC-996

commit f479ce7c7d3764572be2643efb3403409362805f
Author: Drew Teter <[email protected]>
Date:   Thu Oct 13 10:54:50 2022 -0400

    OCC-1001

commit 2a19c3d9b6298e53db1560225504e03caea53e92
Author: Drew Teter <[email protected]>
Date:   Thu Oct 13 10:49:33 2022 -0400

    OCC-1034

commit bea2343cdffe139343d74f4db7070a72df051f9b
Author: Drew Teter <[email protected]>
Date:   Thu Oct 13 10:46:49 2022 -0400

    OCC-1037

commit ccc5912b9bf99f0c7c814d6457e18ab3b54bea0b
Author: tmahtab <[email protected]>
Date:   Wed Oct 12 15:30:03 2022 -0700

    Updating version

commit 9ad1b6f4ee3204b5b92c727dd358816cc53a7308
Author: tmahtab <[email protected]>
Date:   Wed Oct 12 15:23:01 2022 -0700

    Filter available services for itineraries only if not in travel patterns mode.(OCC-1004)

commit 9777d11f5bcb322d6125bbdb9cd13a7924c1add3
Author: tmahtab <[email protected]>
Date:   Wed Oct 12 09:08:21 2022 -0700

    Added support for zip file type for Windows.(OCC-1003)

commit 1b5b11461723f8025dc7991ebeb59a903edcf505
Author: aandrade <[email protected]>
Date:   Fri Sep 30 13:43:40 2022 -0400

    [OCC-859, OCC-974] Add front end validation to service schedule form; change backend error messages depending on schedule type

commit c80e8d63938f75e0a3155dfb753d56da3d943d59
Merge: 5a26f16 a6dbd27
Author: drewteter <[email protected]>
Date:   Tue Sep 27 10:36:37 2022 -0400

    Merge pull request #258 from camsys/uat_bugfixes

    OCLK-423

commit a6dbd2787a180be3d5b623f23b29881ac45d3ab1
Author: Drew Teter <[email protected]>
Date:   Tue Sep 27 10:35:33 2022 -0400

    OCLK-423

commit 5a26f16ca7369b7f0371115c46d881294e24a591
Author: tmahtab <[email protected]>
Date:   Tue Sep 20 18:00:53 2022 -0700

    Fixed Select Agency modal to not appear when emulating transportation agency.(OCC-997)

commit 55e6571c4999fbe5c4c5e62d350f2c5fb4bdd3f6
Author: tmahtab <[email protected]>
Date:   Thu Sep 15 10:56:05 2022 -0700

    Revert accidental check-in

commit c9a0fdef00aac359934e32d17c4657d8abcf7aac
Author: tmahtab <[email protected]>
Date:   Thu Sep 15 10:40:20 2022 -0700

    Added server platform

commit 122829a7aa3b289d3f5943d9b791c7659a96540f
Merge: cc5d56f 3c9583b
Author: drewteter <[email protected]>
Date:   Wed Sep 14 20:08:53 2022 -0400

    Merge pull request #257 from camsys/travel_pattern_bug_fixes

    Travel pattern bug fixes

commit cc5d56fa391ff3f566e6ced6f5d2e3315c792ab9
Author: tmahtab <[email protected]>
Date:   Wed Sep 14 12:43:16 2022 -0700

    Fixed polygon conversion in KML upload.(OCC-987)

commit 89c08ed367f15003352aaba13102059f0b86284f
Author: aandrade <[email protected]>
Date:   Wed Sep 14 13:36:49 2022 -0400

    [OCC-861] Hide empty service schedules hours slot when editing a calendar date type schedule; allow user to change a service schedule's hours between defined time slots and no defined time slots freely

commit 3c9583bf3c85752fdba6220a141a9dd77b0e8dfc
Author: Drew Teter <[email protected]>
Date:   Wed Sep 14 08:22:04 2022 -0400

    Fixes for booking rides in trip planner

commit f62f220f2d67bd614c5cdf251a129dbd4f0f183a
Author: Drew Teter <[email protected]>
Date:   Tue Sep 13 11:23:37 2022 -0400

    Need to get itineraries, cost info, and book trips

commit 8f8e8ac43eccc6080d005545b899397f8c1ced03
Author: tmahtab <[email protected]>
Date:   Mon Sep 12 17:40:28 2022 -0700

    Fix POI buffer default.(OCC-923)

commit 694a4efec48ad1a187d373ddff7a473f115cf451
Author: tmahtab <[email protected]>
Date:   Mon Sep 12 17:07:33 2022 -0700

    Reverse agency load to handle oversight agency drop-down.(OCC-980)(OCC-981)

commit 36ed30b7ff0a59f860973d30af5534588fa7c242
Author: tmahtab <[email protected]>
Date:   Mon Sep 12 11:53:26 2022 -0700

    Fix sub_schedules method missing error.(OCC-978)

commit 7160b1fb95b3e825632f855bf2ceaa14988ec6f8
Merge: 79d1365 bf58575
Author: drewteter <[email protected]>
Date:   Mon Sep 12 14:03:39 2022 -0400

    Merge pull request #256 from camsys/travel_pattern_bug_fixes

    Travel pattern bug fixes

commit bf58575d52f62c8ab11b63e3715a3bac3d167a51
Author: Drew Teter <[email protected]>
Date:   Mon Sep 12 13:50:36 2022 -0400

    OCC-982

commit 79d1365f143fa735148c5c33a8954c05781188d0
Author: tmahtab <[email protected]>
Date:   Mon Sep 12 09:48:12 2022 -0700

    Fixes related to oversight agency drop-down.(OCC-980)(OCC-981)

commit a293c763a266e4397906b11cb0c11767e7f9b77a
Author: Drew Teter <[email protected]>
Date:   Mon Sep 12 06:10:41 2022 -0400

    OCC-799

commit 634b73253261fcea28f80b5a1de29192f487b065
Author: Drew Teter <[email protected]>
Date:   Mon Sep 12 05:51:26 2022 -0400

    OCC-965

commit 5a6577ab3503b503dd97b124d8038a725721a8df
Author: Drew Teter <[email protected]>
Date:   Mon Sep 12 05:39:03 2022 -0400

    OCC-966

commit 79f54f1df66e0fc815e5def09b122f51fe8b96e4
Author: Drew Teter <[email protected]>
Date:   Mon Sep 12 05:27:02 2022 -0400

    OCC-971

commit 635751204458d7396db227f33888ab1634848ec9
Author: Drew Teter <[email protected]>
Date:   Mon Sep 12 05:18:20 2022 -0400

    OCC-975

commit 0357b547bf5d74ca8c0a04b9a767dd02b855676d
Author: tmahtab <[email protected]>
Date:   Fri Sep 9 15:09:09 2022 -0700

    Fixed comma in note.(OCC-801)

commit b665605c6f294d489f4dcc5ecb65c7581bfea069
Author: tmahtab <[email protected]>
Date:   Fri Sep 9 15:07:21 2022 -0700

    Added validation message for name field.(OCC-972)

commit eff4c42237713767f22ba626aa27816d8bdff073
Author: aandrade <[email protected]>
Date:   Fri Sep 2 15:54:32 2022 -0400

    [OCC-861] Make service hours optional for calendar date type service schedules

commit b3048e0534a72fe33d2d3c962e687533d3863d52
Author: tmahtab <[email protected]>
Date:   Tue Aug 30 05:31:11 2022 -0700

    Fix agency admin user permissions.

commit 5e5066e13f37865e15e620eb60800f35c7c9d89e
Author: tmahtab <[email protected]>
Date:   Mon Aug 29 15:53:31 2022 -0700

    Fix staff user dashboard permissions.(OCC-820)

commit cf8676bdd04cc6b62d24843fd7f6f4d2c61eade5
Author: tmahtab <[email protected]>
Date:   Mon Aug 29 10:31:56 2022 -0700

    Permission-related updates

commit ac6027825e47331720ca2159172eed4461c18eaa
Author: tmahtab <[email protected]>
Date:   Mon Aug 29 09:59:09 2022 -0700

    Removed agency hard-coding.(OCC-858)

commit 23610c4804b6ad9ef986788c4e6959a77c61d676
Author: tmahtab <[email protected]>
Date:   Mon Aug 29 09:12:24 2022 -0700

    Clear previous geographies from map on select.(OCC-856)

commit 1b612a1e3891f50fd625b2c769e84a5367ed1cbc
Author: tmahtab <[email protected]>
Date:   Mon Aug 29 07:53:00 2022 -0700

    Change Add schedule to Add hours.(OCC-863)

commit 32195422ccb34c6b5d0fa2f94420d116a98fb204
Author: tmahtab <[email protected]>
Date:   Mon Aug 29 07:23:50 2022 -0700

    Update Set of POIs subheadings.(OCC-799)

commit 3ca2296f08cde1b51677c6bacf227e07dcf5736c
Author: tmahtab <[email protected]>
Date:   Mon Aug 29 05:01:44 2022 -0700

    OD zone updates for travel patterns.

commit beaa2c8ed988a4b5b1e6571aec98525d1d8406cd
Merge: bf5a4bb 4e15a42
Author: drewteter <[email protected]>
Date:   Mon Aug 15 02:26:55 2022 -0400

    Merge pull request #255 from camsys/bug_fix

    OCC-859 OCC-860 OCC-865 OCC-866

commit 4e15a42212bc4e344a5ba2c6e1797632158cbd43
Author: Drew Teter <[email protected]>
Date:   Mon Aug 15 00:06:36 2022 -0400

    OCC-859 OCC-860 OCC-865 OCC-866

commit bf5a4bb5704e5a3687875dc825b046812aa29a70
Author: Alex Andrade <[email protected]>
Date:   Tue Aug 2 16:11:09 2022 -0400

    [PAMF-806] Add confirmation modal to delete service schedule button

commit ec9b85b001ad09676387f88f266aa248f1b5a8ee
Author: Alex Andrade <[email protected]>
Date:   Tue Aug 2 16:03:40 2022 -0400

    [PAMF-805] Persist entered name and description in new service schedule form when validation fails

commit 8dcb9edf96a728111393b63cb1461b4c09b09289
Author: Alex Andrade <[email protected]>
Date:   Tue Aug 2 13:49:04 2022 -0400

    [FMR-174] Set default values in date filters in trips report to within the last month

commit 8cdd9a8f88518bed122c02369ea01fb46cb9df67
Merge: 35fd6e8 66efc4f
Author: drewteter <[email protected]>
Date:   Fri Jul 29 09:47:32 2022 -0400

    Merge pull request #251 from camsys/travel_pattern_trip_api

    Added Route for Trips to validate using Travel Patterns

commit 66efc4f5e3968dd725ba580081f57181e8154152
Author: Drew Teter <[email protected]>
Date:   Tue Jul 26 05:23:37 2022 -0400

    Changes to API for trip planner + travel patterns

commit 33966b3469cfe3cccd4b7e012c3b9301271f70c6
Author: Drew Teter <[email protected]>
Date:   Thu Jun 30 06:40:23 2022 -0400

    Added Route for Trips to validate using Travel Patterns
    OCC-812
    OCC-809
    OCC-808
    OCC-807
    OCC-806
    OCC-803
    OCC-802

commit 51d8eaebc149c394989036596a65777a75688738
Author: tmahtab <[email protected]>
Date:   Mon Jul 25 12:20:25 2022 -0700

    Filter travel patterns API by O/D zone.(OCC-805)

commit 54de58e5fdef1b84694489cc63414e4f05e42da0
Author: Drew Teter <[email protected]>
Date:   Thu Jun 30 06:40:23 2022 -0400

    Added Route for Trips to validate using Travel Patterns
    OCC-812
    OCC-809
    OCC-808
    OCC-807
    OCC-806
    OCC-803
    OCC-802

commit 35fd6e87d8dcf9eae026064b4cda2787841a6855
Author: Drew Teter <[email protected]>
Date:   Fri Jul 22 03:06:56 2022 -0400

    removed leftover debugger statement

commit 38f7da6f4937e5a30fbeeef2fd884deca312d655
Author: Alex Andrade <[email protected]>
Date:   Thu Jul 21 15:14:15 2022 -0400

    [OCC-819] Fix broken Travis build for reports

commit e1a3a48984c6c9339c264abfbca34a04ce92ec44
Author: Alex Andrade <[email protected]>
Date:   Tue Jul 19 13:58:51 2022 -0400

    [OCC-819] Fix trip purpose filter in trips report to filter on external_purpose

commit 7c2b5fa2c726e723dae6b7ad799dee4e3a77e582
Merge: 165c433 e9d8189
Author: drewteter <[email protected]>
Date:   Wed Jul 13 15:10:33 2022 -0400

    Merge pull request #253 from camsys/bug_fixes

    Various fixes and improvements

commit e9d81894b92839e00f10357997cf5ef690d4b627
Author: Drew Teter <[email protected]>
Date:   Wed Jul 13 14:33:19 2022 -0400

    Various fixes and improvements
    OCC-785
    OCC-799
    OCC-792
    OCC-791
    OCC-790

commit 165c433ed8c5e5ef8556dd7034c57319450ecb1d
Author: Alex Andrade <[email protected]>
Date:   Wed Jul 6 13:14:53 2022 -0400

    [OCC-818] Allow "planned by" filter in trips report to consider admins in addition to staff

commit 0a0838a74ea0a6aacd0a0c0affe405c2d0a3f262
Author: tmahtab <[email protected]>
Date:   Thu Jun 23 12:17:47 2022 -0700

    Fixed Return to Travel Patterns link

commit efb98484c2784c9713ccce66b5364a472b564e94
Author: drewteter <[email protected]>
Date:   Thu Jun 23 12:41:19 2022 -0400

    Sets of Pois and Booking Windows (#250)

    * Sets of Pois and Booking Windows
    OCC-629
    OCC-793
    OCC-788
    OCC-789

    * Updated SVGs for travel patterns

commit 50a7ebfb0ac7076693d4d915bd8c8fd8c2114c8f
Author: tmahtab <[email protected]>
Date:   Thu Jun 23 08:36:45 2022 -0700

    Updated test regions factory.

commit 9c0e4ad8637904a4f6025d05453c8d21633ae4e6
Author: Alex Andrade <[email protected]>
Date:   Wed Jun 22 15:55:04 2022 -0400

    [OCC-818] Change Planned By filter to use oversight agencies on trips report

commit 01ba84c5356760289edf39ee158ce39899a9a2e7
Author: tmahtab <[email protected]>
Date:   Thu Jun 16 09:06:30 2022 -0700

    Mapping and geographies setup for travel patterns.(OCC-634)

commit 0674860a5989321c9b121ef80fd5032a52ac46b6
Author: tmahtab <[email protected]>
Date:   Wed Jun 15 16:51:32 2022 -0700

    Merge branch 'hotfix/1.17.1'

commit c4b2dc64b02aa14d9cafd9e5fae714536899e3eb
Merge: 55b0b93 96c3ae5
Author: drewteter <[email protected]>
Date:   Thu Jun 2 12:34:44 2022 -0400

    Merge pull request #247 from camsys/OCC-781

    OCC-781

commit 96c3ae54c134e156b480cdafa2a31abf48f9d85c
Author: Drew Teter <[email protected]>
Date:   Thu Jun 2 12:24:27 2022 -0400

    Fixed failing test for OCC-781

commit 55b0b93eec55cfe0cbe8ce050c5e28f696d97280
Merge: 9adf336 4361ac8
Author: drewteter <[email protected]>
Date:   Thu Jun 2 11:17:30 2022 -0400

    Merge pull request #246 from camsys/ajax_autocomplete

    Changed FormHandler to allow callbacks for autocomplete fields

commit 4361ac8253259662af53024e7a71fd9dd7162ef1
Author: Drew Teter <[email protected]>
Date:   Tue May 31 21:11:26 2022 -0400

    Changed FormHandler to allow callbacks for autocomplete fields
    OCC-638

commit 9adf33695f865344939e3345973d26b0f2f67f14
Author: Alex Andrade <[email protected]>
Date:   Fri May 27 15:28:11 2022 -0400

    [OCC-638] Ensure published services have at least 1 travel pattern assigned; fix small text alignment issue in travel patterns panel on edit service page

commit eefbfcadbd32e3293e990362827dfca95fbed90f
Author: Alex Andrade <[email protected]>
Date:   Thu May 26 12:38:33 2022 -0400

    [OCC-638] Do not allow service to be published unless at least one travel pattern has been assigned to it

commit 02b427a826bce1d60ddbd12562645d696757543d
Author: Alex Andrade <[email protected]>
Date:   Tue May 24 16:26:48 2022 -0400

    [OCC-638] Add travel patterns to edit service page; remove sections for travel pattern configuration

commit 21a35d2aca5795b4018f250f217aeecaa758dc5e
Merge: 625023c c334508
Author: drewteter <[email protected]>
Date:   Mon May 23 11:27:29 2022 -0400

    Merge pull request #245 from camsys/auto_complete_selectors

    Autocomplete Selectors

commit c334508c341688ec8ac20fd3a3131431830beab0
Author: Drew Teter <[email protected]>
Date:   Thu May 19 15:29:29 2022 -0400

    Autocomplete Selectors
    OCC-785
    OCC-753
    OCC-754

commit 625023c54310a3c90e10de662928808b70ec6868
Author: Alex Andrade <[email protected]>
Date:   Wed May 18 16:10:40 2022 -0400

    [OCC-761] Convert trip_time to UTC when printing trips report

commit c04fe55c258d99e303b89d3911f035c6c0fd4da8
Author: W. Scott Meeks <[email protected]>
Date:   Tue May 17 15:00:45 2022 -0400

    OCC-757 Restore unit tests

commit 64ec351403c6d13789960a0e4f215d893c257307
Author: W. Scott Meeks <[email protected]>
Date:   Tue May 17 14:53:25 2022 -0400

    OCC-757 avoid answering "Are you sure you want to continue connecting?"

commit b5ca832f32415877652086d7909a1ddf609c79f6
Author: W. Scott Meeks <[email protected]>
Date:   Tue May 17 14:47:57 2022 -0400

    OCC-757 debugging connection

commit 5818cdbb2a0cb1a9abf7a9e85cde1efe5620fa92
Author: W. Scott Meeks <[email protected]>
Date:   Tue May 17 14:37:35 2022 -0400

    OCC-757 skip cleanup to leave pem file in place

    Also skipping unit tests temporarily to speed testing

commit c702ddd1781b9c072d44e898294b6ebacd754ccb
Author: W. Scott Meeks <[email protected]>
Date:   Tue May 17 14:22:08 2022 -0400

    OCC-757 locate pem file

commit 65a249b6e0071d8905efb63b6184848f293e3e5f
Author: W. Scott Meeks <[email protected]>
Date:   Tue May 17 13:56:49 2022 -0400

    Workaround for error in rake assets:precompile

    See: https://github.com/lautis/uglifier/issues/127#issuecomment-352224986

commit 5d8ad056c919ed5a91f41e3a8c277651ad8a14c2
Author: W. Scott Meeks <[email protected]>
Date:   Tue May 17 13:53:47 2022 -0400

    OCC-757 First pass at automatically deploying to dev if Travis passes

    Added deploy elements to .travis.yml.
    Created deploy script.
    Include encrypted pem.
    Added dev only display of commit id in version number to confirm build on dev.
    Temporarily skip failing test.

commit e296c6d40bb04486a00020327371fb94a69adaed
Author: Alex Andrade <[email protected]>
Date:   Mon May 16 16:41:00 2022 -0400

    [PAMF-790] Remove unused created_in_1click variable in trip controller's cancel method (irrelevant for non-fixed-route trips)

commit edf6f49aa78759154cf0b287f5e8f04560ea11a9
Author: W. Scott Meeks <[email protected]>
Date:   Fri May 13 16:09:34 2022 -0400

    OCC-782 Fix various unit test failures

    1. Replace admins scope using with_role_for_instances
    2. Add back partner_staff scope.
    3. Pass staff_agency to user update test.
    4. Skip trips_controller test

commit 4a8b0b092ab2e939eb0aa62efd48bb03d8dfd947
Author: W. Scott Meeks <[email protected]>
Date:   Thu May 12 17:27:29 2022 -0400

    OCC-755 Add name to purposes factory

commit fd03e11c26b0024964dd6a858ef2e931701923c0
Merge: 20a59b1 ea5cd3a
Author: drewteter <[email protected]>
Date:   Tue May 3 14:48:35 2022 -0400

    Merge pull request #243 from camsys/form_refactor

    Travel Pattern Forms Refactor

commit ea5cd3ade5932880c602a0fd6e7716c704d65405
Author: Drew Teter <[email protected]>
Date:   Mon May 2 21:42:32 2022 -0400

    Travel Pattern Forms Refactor
    Added a new wrapping to simple_forms.rb so that we can use form.input while still matching the styling presented in the wireframes.

commit 20a59b19dc4f3c0a678a8f279da75ae77ec8a2d9
Author: drewteter <[email protected]>
Date:   Tue May 3 12:20:12 2022 -0400

    Travel Pattern Forms Refactor (#242)

    Added a new wrapping to simple_forms.rb so that we can use form.input while still matching the styling presented in the wireframes.

commit 21f239965bf67dc0bcbad4e6276eeea846a46c64
Author: drewteter <[email protected]>
Date:   Mon May 2 16:07:22 2022 -0400

    Adding Funding Sources (#241)

    OCC-750
    Occ-751

commit 88ad81a486b284be795e19fd75868087a0296ab6
Author: Alex Andrade <[email protected]>
Date:   Mon May 2 15:48:59 2022 -0400

    [OCC-734] Fix trip reminder emails sending a day late (time zone calculated in wrong order)

commit baf359cf8687047ada8ff786bd5f4067906edcce
Author: Alex Andrade <[email protected]>
Date:   Mon May 2 14:46:10 2022 -0400

    [OCC-732] Correct time zone discrepancy in customer trip summary emails

commit 417353aa36c5ecc8cc4fbc36a2fdff3cbba9cc29
Merge: 1b6d1fb 13fd870
Author: Alex Andrade <[email protected]>
Date:   Mon May 2 14:43:56 2022 -0400

    Merge remote-tracking branch 'origin/develop' into develop

commit 13fd870ccd6ff69b052b557e5662d8f912a7a55d
Author: drewteter <[email protected]>
Date:   Mon May 2 12:50:00 2022 -0400

    Adding new Trip Purposes pages for travel patterns (#240)

    OCC-743
    OCC-735

commit 1b6d1fbf68ff99fd3e31331af7067aa1437489b9
Author: Alex Andrade <[email protected]>
Date:   Thu Apr 28 14:08:01 2022 -0400

    [OCC-733] Update trip reminder email verbiage, including do not reply message

commit 7d5cd39c6432a82e983d220cc8016d5113dfa231
Author: Alex Andrade <[email protected]>
Date:   Tue Apr 26 16:01:24 2022 -0400

    [OCC-636, OCC-637] Fix issues with deleting service schedules from travel patterns & submit/cancel button toggles and form reset.

commit 9613768c084fd0d08a4fa4988706ed990e4ef03b
Merge: 8b4a974 91ba44e
Author: drewteter <[email protected]>
Date:   Mon Apr 25 10:00:59 2022 -0400

    Merge pull request #239 from camsys/PAMF-772

    PAMF-772

commit 91ba44e785628af331fc26afbf1cc44e33f8dc9d
Author: Drew Teter <[email protected]>
Date:   Thu Apr 21 12:52:31 2022 -0400

    PAMF-772
    Assigned IAM Role to the EC2 that OCC is running on. This means we no longer are using fog to connect to AWS.

commit 8b4a974197f85f0c52594fd8b45d998ccabbff08
Author: Alex Andrade <[email protected]>
Date:   Mon Apr 18 17:34:58 2022 -0400

    [OCC-636, OCC-637] Add autocomplete and delete functionality to travel pattern service schedules form

commit 496041e2c5c417515b3984a1c1fc95956bc85ca0
Author: Alex Andrade <[email protected]>
Date:   Fri Apr 15 17:07:41 2022 -0400

    [OCC-636, OCC-637] Create dynamic fields for travel pattern service schedules (autocomplete pending); establish backend CRUD functionality for travel patterns form (pre-autocomplete)

commit bfd50f1d8cfa4e6b8ea34b3237258254901d645b
Author: Alex Andrade <[email protected]>
Date:   Wed Apr 6 16:25:43 2022 -0400

    [OCC-636, OCC-637] Add travel patterns list and non-functional form including service schedule assignment

commit b4f7a445178570c845afcb7db1d40e765adab667
Author: Alex Andrade <[email protected]>
Date:   Tue Mar 29 18:07:45 2022 -0400

    Service schedule cleanup (#234)

commit 68e8e7140aef4b81ca057c5cf8924cf30a9c2de8
Merge: 01abbcc 304cff8
Author: tmahtab <[email protected]>
Date:   Wed Mar 23 09:37:31 2022 -0700

    Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

commit 01abbcc8a21e4dec58d3bfddd21ef3b05495ce78
Merge: 2844ee9 b6913b6
Author: tmahtab <[email protected]>
Date:   Wed Mar 23 09:17:55 2022 -0700

    Merge branch 'release/1.17.0' into develop

commit 304cff855bb9afca8ba3fdf6d0f1aa6fe80e9244
Author: Alex Andrade <[email protected]>
Date:   Tue Mar 22 12:42:24 2022 -0400

    Service schedules (#233)

    Implement Service Schedules module, including list, deletion, and form for creating new schedules, as well as updating existing ones. Schedule types implemented: Weekly pattern, Selected calendar dates. (OCC-633)

commit 2844ee9ad3bb7800fbb8f7cf596d368831b91cc4
Author: Wilson <[email protected]>
Date:   Tue Mar 8 15:03:25 2022 -0500

    Add progress for Create New Sets of POI page work

commit 4e16544d757dd557cf12cd40f56078fbde84e7c2
Author: Wilson <[email protected]>
Date:   Tue Mar 8 09:04:51 2022 -0500

    add fixes, missing features to custom geographies pages along with extra comments

commit 6daab8c46f7fe271feb60cb370a0fccbdb3144b5
Author: Wilson <[email protected]>
Date:   Wed Feb 23 16:59:27 2022 -0500

    OCC-628 add sets of pois page

commit 568f241aca6c0ac31858713a902ac524b3d9379f
Author: Alex Andrade <[email protected]>
Date:   Thu Feb 10 16:16:44 2022 -0500

    remove table options to fix schema for service schedules

commit a0e49db9dc8c12276dcd2f015dbf3e9a3a3c9ac7
Author: Alex Andrade <[email protected]>
Date:   Thu Feb 10 16:04:25 2022 -0500

    fix schema issues with service schedules

commit a7d517d2009ccee893d0754198750b408fcbd872
Author: Alex Andrade <[email protected]>
Date:   Thu Feb 10 15:45:13 2022 -0500

    [OCC-632, OCC-701, OCC-702, OCC-703, OCC-704, OCC-705] Refactor service schedules permission logic/checks

commit 3f714a8c56586ff6c32d4c0a9e499a4278c49230
Author: Alex Andrade <[email protected]>
Date:   Thu Feb 10 15:40:49 2022 -0500

    Destroy dataTable on service_schedules page before navigating away, to avoid duplicates when using back button

commit b93e223043633cfdc8c13fe11b71e0ca81011473
Author: Alex Andrade <[email protected]>
Date:   Thu Feb 10 15:36:38 2022 -0500

    Add null checkers for certain user authorization checks

commit 0712149f84d5ffa0a3e2df4cc9e01ac2daf8b56b
Author: Alex Andrade <[email protected]>
Date:   Thu Feb 10 15:34:27 2022 -0500

    Rename service schedule infrastructure tables in schema.rb

commit ae81a88501c2604254812ff23ec34d20f5b983b3
Author: Wilson <[email protected]>
Date:   Thu Feb 10 14:20:20 2022 -0500

    Fix ShapefileUploader so geometry data is added to a new record on shapefile upload again

commit dafa56e792c4880a9f613c4b930deb38ab7473e5
Merge: 7ab8f65 d8f44c0
Author: Wilson Jiang <[email protected]>
Date:   Mon Feb 7 09:00:46 2022 -0500

    OCC-630 Add System POIs list page in

commit 7ab8f65c5292436f487713250bbb33e64757b9c3
Merge: 75a0770 f2265d6
Author: Wilson Jiang <[email protected]>
Date:   Mon Feb 7 09:00:01 2022 -0500

    OCC-628 Add new custom geography page

commit f2265d656e41f2d5db5a5dcbe1a0fb9ef8aef2c9
Merge: cebc1dc 75a0770
Author: Wilson Jiang <[email protected]>
Date:   Mon Feb 7 08:59:53 2022 -0500

    Merge branch 'develop' into OCC-628-add-custom-geography-upoload-page

commit d8f44c07fa4e5387ccd8cfb25a8a5c3cb41d48b3
Author: Wilson Jiang <[email protected]>
Date:   Fri Feb 4 11:08:51 2022 -0500

    add comma in, move long_name to the place model

commit 7feb092f13dc283ed035c157d9ac6a2fcd6b4dd7
Author: Wilson Jiang <[email protected]>
Date:   Fri Feb 4 10:01:37 2022 -0500

    add description to custom geographies table

commit cebc1dcbe0f78fcf8e62186eaf3d47f5b87dcab9
Author: Wilson Jiang <[email protected]>
Date:   Fri Feb 4 10:01:37 2022 -0500

    add description to custom geographies table

commit a7cddf710495ebbbdc6d2f39bb4bf904a932b0a5
Author: Wilson Jiang <[email protected]>
Date:   Fri Feb 4 09:55:44 2022 -0500

    add conditional rendering depending on config mode. add long poi name method

commit 75a07709c2b386afd1d1d8d639c27ac16260b884
Author: Alex Andrade <[email protected]>
Date:   Thu Feb 3 13:11:51 2022 -0500

    [OCC-632, OCC-701] Rename travel_patterns_service_schedules to service_schedules, travel_patterns_schedules to service_sub_schedules, and travel_patterns_service_schedule_types to service_schedule_types; modify models, views, and migrations to match new naming scheme; add buttons to service schedules list, along with routes and views to navigate to

commit 791fe1b0baa6b23563507b0f8dc5c750ba22b9b5
Author: Wilson Jiang <[email protected]>
Date:   Thu Feb 3 10:39:57 2022 -0500

    add travel patterns config/ layout to landmarks page

commit a4f8974fdf270f9418108640976787b6f5053bfd
Merge: 66d2b05 04928a8
Author: Wilson Jiang <[email protected]>
Date:   Thu Feb 3 10:54:45 2022 -0500

    OCC-628 Add New Custom Geography page

commit 04928a8025b3abb61e99e9f90477602dffe8bf03
Author: Wilson Jiang <[email protected]>
Date:   Wed Feb 2 12:13:54 2022 -0500

    add table specific stylesheet

commit 5e5bab270a4d7745a91a65aae0eae22cf33ba3e7
Author: Wilson Jiang <[email protected]>
Date:   Wed Feb 2 10:46:14 2022 -0500

    add quick custom geography delete handling

commit 125113aa8ed0b390a0781815efce16ead18f9255
Author: Wilson Jiang <[email protected]>
Date:   Wed Feb 2 09:32:50 2022 -0500

    refactor geographies index so it differentiates between dashboard modes/ is reverse compatible

commit d1646b91dab617eae1945b5e6fdac5c60d41e562
Author: Wilson Jiang <[email protected]>
Date:   Tue Feb 1 11:36:30 2022 -0500

    remove redundant routes

commit b3babbf61a9ce3474cb2bcc8b770cd7ec4eb1834
Author: Wilson Jiang <[email protected]>
Date:   Tue Feb 1 13:59:52 2022 -0500

    add agency assign to custom geography creation

commit 1531983cc386cc141a8f1183e9b2ab5d64668c90
Author: Wilson Jiang <[email protected]>
Date:   Tue Feb 1 13:57:33 2022 -0500

    clean styling up a bit to match mockup

commit 957f3a0247787f55486effabe067f2b0f3c3773a
Author: Wilson Jiang <[email protected]>
Date:   Tue Feb 1 11:36:05 2022 -0500

    add dynamic file upload disable and a reset button

commit e6faaca0b54a69e885766fad31efa2efe24e85bf
Author: Wilson Jiang <[email protected]>
Date:   Tue Feb 1 11:23:00 2022 -0500

    add dynamic file upload disable and a reset button

commit c11b1b8d79f30cadb0ab157e0ea1a2ddaeb2a3e7
Author: Wilson Jiang <[email protected]>
Date:   Tue Feb 1 10:56:52 2022 -0500

    add create action and modify how ShapefileUploader handles creating custom geographies

commit a86ecdbf3683e32131d515bf9a0f656a3a7c5e06
Author: Wilson Jiang <[email protected]>
Date:   Tue Feb 1 09:54:55 2022 -0500

    add migration constraining the name column in custom geographies so that values must be unique, update model to reflect the above

commit 7ada2bf7323b7b0fd1686769fdfa957d6e985603
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 31 10:03:46 2022 -0500

    add initial form for new custom geography

commit 66d2b05ac0dd66f52db9cf3e584e25c004cc36a3
Merge: 29a24e7 a8cb551
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 28 15:01:56 2022 -0500

    OCC-711 OCC-712 add standard and custom geographies list pages

commit a8cb55159cd37c528b71112dff10f3b86ba18836
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 28 14:10:03 2022 -0500

    add click handler for clicking table rows in

commit c6981e81f46ee5ac2839aa01b963ec065d4ac207
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 28 10:48:32 2022 -0500

    modify permissions so Transit Admins/ Rabbit admins can view the Travel Patterns root page

commit 33195cc12b9d13c58a8d8c24efd4bb6b5f48751c
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 28 10:40:25 2022 -0500

    add disabled buttons for various actions to custom geographies index

commit a66d6353344bc3d5523ae7be5df2c7e3d50baadd
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 28 10:07:45 2022 -0500

    refactor out custom geographies related code to its own controller

commit 9b27ce2a03e7f03cef14ad1e9edeeb95248306d5
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 28 09:48:12 2022 -0500

    add new custom geographies button to custom geographies page, standardize footer link styles

commit 6858740d46175c87751c96b4f8da6b1732f84c20
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 28 09:31:28 2022 -0500

    add custom geographies page and index_geographies action in geographies controller

commit 95d1a48d61fb567e515cd8fbe91c91b1b852d0f6
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 28 09:18:41 2022 -0500

    Add links to standard geographies page footer, fix some styles

commit 8878b388b50d00d79c30c134e7891ae12cd1dee2
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 27 11:09:48 2022 -0500

    refactor index action in geographies controller to use query params to display only one type of standard geography at a time

commit 25065c58ca460233fd861862c35293dca7bb492b
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 27 11:07:58 2022 -0500

    add standard geographies page with styles and change default pagination

commit 29a24e73f6f38a75fcb5738799349e069002e753
Author: Nico <[email protected]>
Date:   Tue Jan 25 17:32:28 2022 -0500

    fix general info disappearing bug (#230)

    Co-authored-by: Nicolas Beiro LeBeau <[email protected]>

commit 37444d3c8653421ad4b035285e71a19a970ad3b1
Merge: 383ae18 dc191ea
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 25 11:54:16 2022 -0500

    OCC-625 create travel patterns root and setup new routes

commit dc191ea5bd7f0be597dd131dde9c30d36d193d9e
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 25 11:42:49 2022 -0500

    update schedules views and referenced paths in root page to reflect changes

commit 404c6d4ebedbaea6e24cc5626b7db0521d6f65a7
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 25 09:42:24 2022 -0500

    rename routes, update and move relevant files

commit 383ae1857ff0a93fc62a356a6d5611ea17836a56
Merge: bd53df9 bd72279
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 13:44:51 2022 -0500

    OCC-614 Update test suite to pass or skip unit tests

    Minimally update tests to pass, or skip those that require extensive changes. Note that the fixes doesn't make the test suite reflect One Click's current requirements

commit bd72279ee003958839506711ee24dc6ebab8e222
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 13:44:14 2022 -0500

    remove tests in travel patterns controller until implemented

commit f050a057ed8ba08c3606a3693678657ee8edffe2
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 21 09:45:14 2022 -0500

    Add the rest of the travel patterns root styling

commit 21c994c4c075ff7e1bb3cf1ac6a9bed4e1fc57b8
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 11:28:55 2022 -0500

    update itinerary serializer test so it passes and doesn't use hard coded id value in assertion

commit 67f66313762609fe4af6f6aca69f64bb7e041a07
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 11:13:10 2022 -0500

    update trip planner tests to pass, add comments

commit cd998e3a167e179e21f185330ee71307fcd47ecd
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 10:59:06 2022 -0500

    update password reset tests to pass, add comment about update

commit 065eeddd74bd21fb1a6e8ebb46b11a06eea3b57e
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 10:05:49 2022 -0500

    update itinerary serializer tests to pass remaining tests

commit 8bedb10f91eb10d71bbeffe24dfea10fc8936418
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 10:00:08 2022 -0500

    add comment to services controller

commit 5f6ec930f22d621b0af412365541e45dc161845f
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 09:59:55 2022 -0500

    Update admin::users_controller#staff so it passes

    Also remove several role_helper scopes that still query for staff/ admin users with no agency assigned

commit ab2dee2b16894fd87ba3c2d95df2ea7dd6992f4b
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 24 09:27:19 2022 -0500

    skip travel patterns controller tests for now

commit bd53df971942e4c87c5a57c81159f01c0f498526
Author: Alex Andrade <[email protected]>
Date:   Fri Jan 21 16:55:28 2022 -0500

    [OCC-632, OCC-701, OCC-710] Add backend infrastructure for travel pattern service schedules; add travel pattern service schedules list page; add safeguards for logging errors when changing config

commit c3a65504f37acf3c2ec844fdef9d11f369564659
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 21 14:51:55 2022 -0500

    Fix services controller/ controller test setup to pass

commit cab79bbfd0b2895dea7911b23120d8d2808aa11a
Author: Wilson Jiang <[email protected]>
Date:   Fri Jan 21 11:09:41 2022 -0500

    Fix or skip certain user model/ mailer specs tests

commit b3a8bb4458f0fae5d02a07a5fd8e486ce7eba113
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 20 14:00:10 2022 -0500

    fix reports controller, add skips and notes to tests that aren't as straight-forwards to potentially fix

commit 0420d30e4d3f8b2c774eb28b4033099e23b5404d
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 20 14:12:21 2022 -0500

    skip tests in travel patterns controller for now

commit 271a66fda8ac0d32469773a4d837817be79b9720
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 20 14:12:10 2022 -0500

    skip certain tests in trips_controller due to strange itinerary cancellation interaction

commit 6946c4c8d543fe546abd61f879146ec0db8f05ec
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 20 09:59:20 2022 -0500

    fix Admin::UsersControllers superuser tests to pass under the new requirements

commit dec1c27a4dcb7c9f0c1952e175db971100a854f8
Author: Wilson Jiang <[email protected]>
Date:   Wed Jan 19 16:07:14 2022 -0500

    update the default password for test users because that seems a tad bit insecure

    A tad bit insecure for uhhh reasons

commit 6806dc20e1671d7fd9aaabd1058c9c247a46d18c
Author: Wilson Jiang <[email protected]>
Date:   Wed Jan 19 13:59:51 2022 -0500

    start updating user model tests to pass

commit 2c2567c002ca3765105183e19b3c3d8b870b4847
Author: Wilson Jiang <[email protected]>
Date:   Wed Jan 19 13:59:32 2022 -0500

    add additional check for traveler? method

commit 83a1a3765b3f72f849cab94ee6cae01c2c24c18c
Author: Wilson Jiang <[email protected]>
Date:   Wed Jan 19 11:43:08 2022 -0500

    update geographies tests to pass

commit 343c2553885a94d60b21051c77b889ca689cfec1
Author: Wilson Jiang <[email protected]>
Date:   Wed Jan 19 11:33:12 2022 -0500

    add better elsif check to travelers_for_current_agency method

commit bb7bc444befc3fca3ab3e087bb9c1b147877a9da
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 13:45:35 2022 -0500

    update feedback controller test to pass, update related test jigs

commit bf147bc5edd9ec0aee5403e4babf625c8d2c8870
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 13:45:35 2022 -0500

    add fallback for getting pages based on dashboard mode

commit e3b59780fb3a0acf5159084a6299fe469f014d8d
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 13:44:46 2022 -0500

    add factory for config dashboard mode

commit 4159e1f2ea8672652c86be610341fea4208d249b
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 11:39:12 2022 -0500

    make easy fixes to tests that require superuser logins

commit f6a2cc3f29457c8b305b5a093c13ce89a4c660c8
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 11:38:57 2022 -0500

    add superuser factory

commit 5473dff474eb608e1864e3845e1a955a5bd0e7c0
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 11:04:50 2022 -0500

    update itinerary serializer test to reflect changes to requirements(i.e it needs to return more data)

commit d5fcbc523a9cd035955918996a7808eb36ad93a0
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 11:00:40 2022 -0500

    fix bad travel patterns test path

commit 7b7d859e65575a4ee49f6093f569bd4f1865c8eb
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 11:00:31 2022 -0500

    update landmarks model spec to account for change in requirements

commit d7bc4e9c65e2cf1c3bf959d10edbcdfea4ed86e8
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 11:00:10 2022 -0500

    update build_homepage_charts so it runs on one page/ action only

commit 70c9a3420368c2df30a7e4b666c810c1abe512ed
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 18 10:25:57 2022 -0500

    update test jig for agencies to include new agency types

commit 2d126460bee3a6afcb724124c3276268048656bd
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 13 16:32:41 2022 -0500

    OCC-708 update routes for travel patterns

    OCC-708 create controllers for schedules, landmark sets and odzones

    OCC-708 create minimal views for the new pages

commit 3e83673d80bb25b08bcd5f33a5e1527d76b788a5
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 13 15:57:17 2022 -0500

    OCC-708 create minimal views for the new pages

commit 6ae7620a2ba3643ea2fb291eebc12900e102ab4b
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 13 15:19:43 2022 -0500

    OCC-708 create controllers for schedules, landmark sets and odzones

commit cfe541b48cb3540272a4c6b19a92756d403000cd
Author: Wilson Jiang <[email protected]>
Date:   Thu Jan 13 14:17:18 2022 -0500

    OCC-708 update routes for travel patterns

commit 92234dedcffdc329600a4d96e5955b1edc935063
Author: Wilson Jiang <[email protected]>
Date:   Wed Jan 12 10:55:29 2022 -0500

    OCC-697 OCC-698 OCC-699 add minimal styling and arrow placeholders

commit a98fbb49c1810e495fd996ed676a80ae734a2097
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 11 13:27:29 2022 -0500

    OCC-697 OCC-698 OCC-699 update link text in travel patterns root

commit 0477501c05bf76b60bb8495a73ef738aab9b34a3
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 11 09:59:04 2022 -0500

    OCC-697 OCC-698 OCC-699 update links available in the main dashboard page and utilities dropdown

commit 53522d67b08d8db0fadaad7c28614113ed54d13b
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 11 09:38:36 2022 -0500

    OCC-697 OCC-698 OCC-699 add placeholder/ initial routes for eventual new pages

commit 19f43e6f83668fc5925446a21d8c172a09315c8b
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 10 16:36:24 2022 -0500

    OCC-697 OCC-698 OCC-699 update dashboard mode collection to be more human readable

commit ef24e0f3e8518a2bf21a304adc140338573ad070
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 10 10:47:35 2022 -0500

    OCC-697 OCC-698 OCC-699 add permissions for viewing/ managing the new TravelPattern model

commit 2ca748f64536778fbd4faa3bf1ea704c91f7b370
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 10 10:31:10 2022 -0500

    OCC-700 add model for initial Travel Patterns

commit fb37662fdcd81bf6c2ca1942bd6211daca0bbccf
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 10 10:20:52 2022 -0500

    OCC-697 OCC-698 OCC-699 Add config option to toggle between the Travel Patterns dashboard and the default dashboard

commit 39dbf70ed44ad3ca7436b026a9dface1fb34d1a3
Author: Wilson Jiang <[email protected]>
Date:   Mon Jan 10 09:49:15 2022 -0500

    OCC-700 add migration to create an init travel patterns table

commit 43721bfb706f5d2d16db7d1663027338d4e954b5
Author: Wilson Jiang <[email protected]>
Date:   Wed Jan 5 12:16:33 2022 -0500

    OCC-694 add initial layout based on the mockup and some link styling

commit 02d7cd0fdedabcced77afab7f6a83fe4a997aa54
Author: Wilson Jiang <[email protected]>
Date:   Wed Jan 5 09:51:10 2022 -0500

    OCC-694 setup bare minimum travel patterns root

commit c6e2cc61f42fbd516f2d6bafeb20e0213afc8c6b
Author: Wilson Jiang <[email protected]>
Date:   Tue Jan 4 16:04:26 2022 -0500

    OCC-694 Scaffold travel patterns controller and index/ create views

.gitignore

@@ -36,9 +36,16 @@
 
 # ruby version file
 .ruby-version
+.tool-versions
 
 # .idea file for RubyMine
 /.idea
 
 # Ignore application configuration
 /config/application.yml
+
+# Ignore Docs generated by rdoc
+/doc
+
+# Compiled assets
+/public/assets/*

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.4.0
+  - 2.6.9
 
 # https://docs.travis-ci.com/user/database-setup/#using-postgis
 services:
@@ -10,7 +10,12 @@ addons:
   apt:
     packages:
       - postgresql-10-postgis-2.4
-
+
+before_install:
+- curl ifconfig.co #print IP address
+- openssl aes-256-cbc -K $encrypted_ee5f58ad4bd6_key -iv $encrypted_ee5f58ad4bd6_iv -in cpta_aws.pem.enc -out cpta_aws.pem -d
+- chmod 600 cpta_aws.pem
+
 before_script:
 - pwd
 - ls -a
@@ -37,4 +42,10 @@ branches:
   only:
   - master
   - develop
-
+
+deploy:
+  provider: script
+  script: bash travis_deploy.sh
+  skip_cleanup: true
+  on:
+    branch: develop

Gemfile

@@ -46,7 +46,7 @@ gem 'lograge-sql'
 gem 'awesome_print'
 gem 'haml-rails'
 gem 'simple_form'
-gem 'bootstrap-sass', '3.2.0.4'
+gem 'bootstrap-sass', '~> 3.3.6'
 gem 'autoprefixer-rails'
 gem 'jquery-ui-rails'
 gem 'bootstrap-datepicker-rails'
@@ -56,6 +56,10 @@ gem 'phony_rails' # For normalizing phone numbers
 gem 'jquery-datatables-rails', '~> 3.4.0'
 ############################################
 
+### PAGINATION #############################
+# gem 'kaminari', '~> 1.2.2'
+gem 'pagy', '~> 5.10.1'
+############################################
 
 ### API & SERIALIZING ######################
 # ActiveModel Serializers for serving JSON via the API
@@ -98,6 +102,7 @@ gem 'rgeo'
 gem "rgeo-proj4"
 gem 'activerecord-postgis-adapter'
 gem 'rgeo-shapefile'
+gem 'geospatial-kml'
 gem 'dbf'
 gem 'rubyzip' # For unzipping shapefiles
 gem 'leaflet-rails' # For embedding maps
@@ -140,7 +145,9 @@ group :development, :test do
   gem 'rspec-rails', '~> 3.5'
   gem 'rails-controller-testing'
   gem 'shoulda-matchers', require: false
-  gem 'factory_bot_rails'
+
+  # Factory_bot 5.0 no longer allows static attributes. We should change our factories if we want to upgrade
+  gem 'factory_bot_rails', '~> 4.11'
   ##########################################
 end
 
@@ -158,6 +165,7 @@ group :development do
   gem "letter_opener"
 
   gem 'rb-readline'
+  gem "rdoc", "~> 6.3.0"
 end