Dan Funk
1b9166dcb7
Cleaning up the merge, which resulted in some lost code.
2020-06-16 13:34:21 -04:00
Dan Funk
c7d8eaff30
Merge branch 'dev' into feature/refactor_data_loading
2020-06-16 13:15:43 -04:00
Dan Funk
92580ee867
adding an additional error check for invalid json returned from the Protocol builder.
2020-06-15 12:26:53 -04:00
Dan Funk
eec4b579a7
Don't error out if we don't have a valid study id when doing validation.
2020-06-15 11:27:28 -04:00
Aaron Louie
2a84d5196a
filter, not filter_by
2020-06-12 14:13:27 -04:00
Aaron Louie
e3126620b3
Eschews obfuscation
2020-06-12 14:09:08 -04:00
Aaron Louie
561e254315
Prevents non-admin users from editing each others' tasks. Fixes bug where test user uid was not being set from token. Moves complete form and get workflow API test utility methods into BaseTest.
2020-06-12 13:46:10 -04:00
Dan Funk
777e429382
Merging production back into dev, because we got out of whack somehow.
2020-06-08 14:19:30 -04:00
Dan Funk
8cf420b781
Default mail user name and password to blank.
2020-06-08 14:15:56 -04:00
Dan Funk
e370148380
Merge pull request #112 from sartography/rrt/dev
...
Rrt/dev
2020-06-08 13:18:41 -04:00
Carlos Lopez
0351b3548a
Adding bcc to all emails sent
2020-06-08 11:17:17 -06:00
Carlos Lopez
f91fbf76b9
Capturing explicit errors from mails
2020-06-08 09:16:26 -06:00
Aaron Louie
af1c848f65
Merge branch 'rrt/dev' into rrt/testing
2020-06-07 19:57:09 -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
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
Dan Funk
1f32a99efe
Some approval statuses coming back as null., fixed
2020-06-05 14:55:49 -04: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
4fc1b51cbc
Approve/denied emails
2020-06-05 12:08:31 -06: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
50d2acac9c
Made a very stupid mistake with LDAP connections, pushing up quickly to production.
2020-06-04 11:57:00 -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
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
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
Dan Funk
1db9401166
Don't put all the data into Spiff Tasks on a reload or backtrack, just store the data that gets submitted each time in the task log, and use that.
...
This should correct issues with parallel tasks and other complex areas - so we don't have tasks seeing data that isn't along their path.
2020-06-01 17:42:39 -04:00
Dan Funk
b6bf843f6e
used 'name' rather than 'value' in the lookup options during validation, causing a disconnect with how this is processed on the front end.
2020-06-01 11:00:56 -04:00
Aaron Louie
7c8b7829ea
Merge branch 'rrt/dev' into feature/approvals_enhancements
2020-06-01 00:41:51 -04:00
Carlos Lopez
bec11980eb
Fixing broken test by using proper FileSchema
2020-05-31 22:00:52 -06:00
Carlos Lopez
b2e56f797b
Converting ApprovalModel to Approval in order to serialize properly the result
2020-05-31 21:02:47 -06:00
Aaron Louie
f0bd8d4f9e
Adds approvals to study schema. Adds approvals endpoint
2020-05-31 22:46:32 -04:00
Dan Funk
9c7de39b09
This adds additional file data details to the study model as well.
2020-05-31 21:15:40 -04:00
Carlos Lopez
26809d1470
Waiting status renaming
2020-05-31 13:35:42 -06:00
Dan Funk
2bc735a3f0
Kelly wrote a beautiful method for resetting the workflow that doesn't loose data when reset inside a parallel task, all I needed to do was use it.
...
Catching TypeErrors and reporting them back to the UI so we don't 500 in a bad way (but we still 500)
2020-05-31 13:48:00 -04:00
Dan Funk
98fb305868
Run the validation process twice, each time it is requested, first populating everything, and then a second time
...
using on the required form fields.
2020-05-30 18:43:20 -04:00
Dan Funk
1f0e8741ba
Run the validation twice, once completing all of the data, and a second time, completing only the required fields.
...
Also, add a helper method to reduce boiler plate code around Workflow Exceptions.
2020-05-30 17:26:27 -04:00
Dan Funk
860c475b29
Fill out repeating sections during validation process.
...
Also, when returning error messages, attempt to include the task data for the task that caused the error.
Also, when attempting to delete any file, respond with an API error explaining the issue, and log the details.
2020-05-30 15:37:04 -04:00
Dan Funk
4e4cc7884c
Better ldap searching.
2020-05-29 15:17:51 -04:00
