Commit Graph

1020 Commits

Author SHA1 Message Date
Aaron Louie ebb37b4555 Merge branch 'rrt/testing' into rrt/staging 2020-06-07 19:57:25 -04:00
Aaron Louie af1c848f65 Merge branch 'rrt/dev' into rrt/testing 2020-06-07 19:57:09 -04:00
Aaron Louie 0774942b99 Merge branch 'feature/better_approval_status' into rrt/dev 2020-06-05 22:19:58 -04:00
Aaron Louie 1d3f98b381 Adds endpoint to quickly get counts of approvals in each status group for a user 2020-06-05 22:19:37 -04:00
Dan Funk 213d3f3501 Merge branch 'feature/better_approval_status' into rrt/dev 2020-06-05 19:11:16 -04:00
Dan Funk 6861991d8f Allow setting the type of approvals you want back, by status.
Some very minor performance enhancements, that will add up on the Approvers page.
2020-06-05 17:49:55 -04:00
Carlos López 75232cbc0f
Merge pull request #109 from sartography/feature/mail-system
Feature/mail system
2020-06-05 15:20:19 -06:00
Aaron Louie f0904e75a6 Sets main approval status after related approvals have been populated 2020-06-05 15:54:53 -04:00
Carlos Lopez 663da57d8b Config can read smtp values from environment now 2020-06-05 13:54:37 -06:00
Carlos Lopez 57a7c7fa54 Approve/deny fixes 2020-06-05 13:39:52 -06:00
Carlos López dffce69d16
Merge pull request #108 from sartography/rrt/dev
Mail update
2020-06-05 12:58:29 -06:00
Dan Funk 1f32a99efe Some approval statuses coming back as null., fixed 2020-06-05 14:55:49 -04:00
Carlos López 699a1d3d10
Merge pull request #105 from sartography/feature/mail-system
Mails for approval process
2020-06-05 12:50:04 -06:00
Carlos Lopez 16ca4fa2c0 Merge branch 'rrt/dev' into feature/mail-system 2020-06-05 12:35:05 -06:00
Dan Funk f0db5b70fc Adding some additional logic to the approval endpoint so that we take related approvals into account when setting the status. In addtion to prevous status options, there is a new status of "AWAITING" which means there are pending approvals before this approval that still need to be approved or canceled. 2020-06-05 14:33:00 -04:00
Carlos Lopez a6758fd555 Removing deprecation warnings 2020-06-05 12:08:46 -06:00
Carlos Lopez 4fc1b51cbc Approve/denied emails 2020-06-05 12:08:31 -06:00
Aaron Louie b51b431534 Merge branch 'rrt/dev' into dev 2020-06-05 09:24:34 -04:00
Aaron Louie 6668ec8cf3 Merge branch 'rrt/testing' into rrt/staging 2020-06-05 09:24:21 -04:00
Aaron Louie 66cd490f8e Merge branch 'rrt/dev' into rrt/testing 2020-06-05 09:24:09 -04:00
Carlos Lopez 4727d87adb Hooking up emails into process - start 2020-06-04 20:37:28 -06:00
Dan Funk b6abb0cbe2 using a restartable strategy to get around login errors 2020-06-04 18:03:59 -04:00
Dan Funk 9cfe00dfd0 Don't bind all the time. 2020-06-04 15:38:45 -04:00
Dan Funk fed6e86f92 Trying to fix LDAP issues on production. Changing LDAP to static only methods, caching the connection and calling bind before all connection requests.
Also assuring we don't load the documents.xls file over and over again.
2020-06-04 14:59:36 -04:00
Carlos Lopez 8c36d9f367 Email calls outline 2020-06-04 11:43:10 -06:00
Dan Funk cc6f31c850 Merge branch 'rrt/production' of github.com:sartography/cr-connect-workflow into rrt/production 2020-06-04 11:57:19 -04:00
Dan Funk 50d2acac9c Made a very stupid mistake with LDAP connections, pushing up quickly to production. 2020-06-04 11:57:00 -04:00
Dan Funk c576858667
Merge pull request #107 from sartography/rrt/dev
Rrt/dev
2020-06-04 11:03:02 -04:00
Dan Funk 68aeaf1273 BE VERY CAREFUL where you create a new LdapService() - construction is expensive.
Adding a few more details to the "csv" endpoint for RRT.
2020-06-04 10:33:17 -04:00
Dan Funk bbcbfef1ba Fixing the migrations so I don't break the universe. 2020-06-04 10:09:36 -04:00
Dan Funk 1324533865 Some additional cleanup - when a file is "archived" it is no longer returned for any endpoints about files, but it
is directly accessible via id, in the event some request is made for it at a later date.
2020-06-04 09:49:42 -04:00
Carlos Lopez f581bd9f2b Mails for approval process 2020-06-04 00:35:59 -06:00
Dan Funk 217ecfc911 When you can't delete a file, mark it as archived. Don't include archived files in new approval requests. 2020-06-03 17:34:27 -04:00
Dan Funk c179c7781b Do not process or return cancelled approvals via the API. 2020-06-03 16:50:47 -04:00
Dan Funk e102214809 minor cleanup of error codes. 2020-06-03 15:03:22 -04:00
Aaron Louie 0368a12eda Merge branch 'rrt/dev' into dev 2020-06-03 10:32:57 -04:00
Aaron Louie ac4279e533 Merge branch 'rrt/testing' into rrt/staging 2020-06-03 10:32:44 -04:00
Aaron Louie 2d5cddd957 Merge branch 'rrt/dev' into rrt/testing 2020-06-03 10:32:25 -04:00
Dan Funk 3e1d492bb1 Merge branch 'rrt/production' of github.com:sartography/cr-connect-workflow into rrt/production 2020-06-03 08:09:58 -04:00
Dan Funk 00a1902c71 Merge branch 'rrt/dev' into rrt/production 2020-06-03 07:59:05 -04:00
Dan Funk 299ad4fc8b Adding more details to the csv output, and assuring we don't miss people with outstanding approvals that were cancelled. 2020-06-03 07:58:48 -04:00
Aaron Louie 6bd2b65500 Merge branch 'rrt/dev' into dev 2020-06-03 00:02:52 -04:00
Aaron Louie 1c25e58900 Merge branch 'rrt/testing' into rrt/staging 2020-06-03 00:02:37 -04:00
Aaron Louie 09558984d1 Merge branch 'rrt/dev' into rrt/testing 2020-06-03 00:02:24 -04:00
Dan Funk 7b8c797996
Merge pull request #103 from sartography/rrt/dev
Rrt/dev
2020-06-02 22:10:18 -04:00
Dan Funk 4bf13b0718 Doing everything I can imagine to get a CSV dump out tomorrow. 2020-06-02 22:01:49 -04:00
Dan Funk e7c130054d Fixing a test. 2020-06-02 20:07:56 -04:00
Dan Funk 2424b9d78c Don't overwrite the approval, just allow minor changes. 2020-06-02 19:36:06 -04:00
Dan Funk 2cd6311666 as always, forgot the migration. 2020-06-02 18:17:51 -04:00
Dan Funk c7484267e1 For the main approval endpoints - we now group the approvals by study. So you get one record back for each study, but it may have other approvals along with it as "related_approvals".
We now cache the LDAP records - so we look in our own database for the record before calling out to ldap for the details when given a straight up computing id like dhf8r.

Added "date_approved" to the approval model.

And moved the approver and primary investigator into real associated models to make it easier to dump.

Fixed a problem with the validation that was causing it to throw incorrect errors on valid workflows. Getting it to behave a little more like the front end behaves, and respecting the read-only fields.  But it was mainly to do with always returning all the data with each form submission.
2020-06-02 18:17:00 -04:00